diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-05-16 23:36:32 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-05-17 18:23:08 -0700 |
| commit | 57b354e66b67c4c72468a26d4313d1217ef32e17 (patch) | |
| tree | ec1f61d50f7e50a116d42d9dff6288e152537591 /net/core/dev.c | |
| parent | xen-netback: enable user to unload netback module (diff) | |
| download | linux-dev-57b354e66b67c4c72468a26d4313d1217ef32e17.tar.xz linux-dev-57b354e66b67c4c72468a26d4313d1217ef32e17.zip | |
dev: remove duplicate 'skb->dev = dev' in dev_forward_skb()
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>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index fc1e289397f5..18e9730cc4be 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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; |