* [PATCH] dev: remove duplicate 'skb->dev = dev' in dev_forward_skb()
@ 2013-05-17 9:36 Nicolas Dichtel
2013-05-17 13:39 ` Eric Dumazet
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Dichtel @ 2013-05-17 9:36 UTC (permalink / raw)
To: davem; +Cc: netdev, Nicolas Dichtel
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>
---
net/core/dev.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index fc1e289..18e9730 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;
--
1.8.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] dev: remove duplicate 'skb->dev = dev' in dev_forward_skb()
2013-05-17 9:36 [PATCH] dev: remove duplicate 'skb->dev = dev' in dev_forward_skb() Nicolas Dichtel
@ 2013-05-17 13:39 ` Eric Dumazet
2013-05-18 1:23 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Eric Dumazet @ 2013-05-17 13:39 UTC (permalink / raw)
To: Nicolas Dichtel; +Cc: davem, netdev
On Fri, 2013-05-17 at 11:36 +0200, Nicolas Dichtel wrote:
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dev: remove duplicate 'skb->dev = dev' in dev_forward_skb()
2013-05-17 13:39 ` Eric Dumazet
@ 2013-05-18 1:23 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-05-18 1:23 UTC (permalink / raw)
To: eric.dumazet; +Cc: nicolas.dichtel, netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 17 May 2013 06:39:12 -0700
> On Fri, 2013-05-17 at 11:36 +0200, Nicolas Dichtel wrote:
>> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-18 1:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-17 9:36 [PATCH] dev: remove duplicate 'skb->dev = dev' in dev_forward_skb() Nicolas Dichtel
2013-05-17 13:39 ` Eric Dumazet
2013-05-18 1:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox