aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Fastabend <john.r.fastabend@intel.com>2010-06-13 10:36:30 +0000
committerLeann Ogasawara <leann.ogasawara@canonical.com>2010-06-14 11:25:50 -0700
commit3e7c686b0eb6e97d122493fdf5a2fe7d1c40e014 (patch)
tree7eff20265e3051b48dc9596958d6d678d82b2587
parent474fae7b6ce03bd01a94f1f70039fee9198c6c56 (diff)
net: fix deliver_no_wcard regression on loopback device
deliver_no_wcard is not being set in skb_copy_header. In the skb_cloned case it is not being cleared and may cause the skb to be dropped when the loopback device pushes it back up the stack. http://lkml.org/lkml/2010/6/13/152 http://git.kernel.org/?p=linux/kernel/git/davem/net-2.6.git;a=commit;h=e897082fe7a5b591dc4dd5599ac39081a7c8e482 Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
-rw-r--r--net/core/skbuff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 9f07e749d7b..bcf2fa3e0dd 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -532,6 +532,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
new->ip_summed = old->ip_summed;
skb_copy_queue_mapping(new, old);
new->priority = old->priority;
+ new->deliver_no_wcard = old->deliver_no_wcard;
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
new->ipvs_property = old->ipvs_property;
#endif