diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-05-28 18:29:23 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-05-28 18:29:23 +0100 |
| commit | 2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44 (patch) | |
| tree | de062b67715e1eb0321032ad2a87f12cb664643b /drivers/net/macvlan.c | |
| parent | af885f4022622331f17227dfcfbb2dafdee25a43 (diff) | |
| parent | eed542d6962ba33a689b4007a389f466e407bd74 (diff) | |
Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next/core
Core ftrace changes from Steve Rostedt, required by the arm64 support
code.
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 753a8c23d15d..b0e2865a6810 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -263,11 +263,9 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) const struct macvlan_dev *vlan = netdev_priv(dev); const struct macvlan_port *port = vlan->port; const struct macvlan_dev *dest; - __u8 ip_summed = skb->ip_summed; if (vlan->mode == MACVLAN_MODE_BRIDGE) { const struct ethhdr *eth = (void *)skb->data; - skb->ip_summed = CHECKSUM_UNNECESSARY; /* send to other bridge ports directly */ if (is_multicast_ether_addr(eth->h_dest)) { @@ -285,7 +283,6 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev) } xmit_world: - skb->ip_summed = ip_summed; skb->dev = vlan->lowerdev; return dev_queue_xmit(skb); } |