dev: remove duplicate 'skb->dev = dev' in dev_forward_skb()
authorNicolas Dichtel <nicolas.dichtel@6wind.com>
Thu, 16 May 2013 23:36:32 +0000 (23:36 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 18 May 2013 01:23:08 +0000 (18:23 -0700)
This was added by commit 59b9997baba5 (Revert "net: maintain namespace
isolation between vlan and real device").
In fact, before the initial commit - the one that is reverted -, this
statement was not present.
'skb->dev = dev' is already done in eth_type_trans(), which is call just
after.

Spotted-by: Alain Ritoux <alain.ritoux@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index fc1e289397f5895f3d2191ee78c9b450cc33e5cf..18e9730cc4be13a8320f4bfdc108a50b57106f82 100644 (file)
@@ -1629,7 +1629,6 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
                return NET_RX_DROP;
        }
        skb->skb_iif = 0;
-       skb->dev = dev;
        skb_dst_drop(skb);
        skb->tstamp.tv64 = 0;
        skb->pkt_type = PACKET_HOST;