diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-15 05:59:34 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-15 05:59:34 (GMT) |
commit | 6b08f516244abda22c07b5e7db10ef109dc43f2d (patch) | |
tree | 098fbb9b45213feeb5e093a9a690ef76e624469a /net/core | |
parent | 0b5c25e8ac3a60bd01a52ca7405ba96aec8c16be (diff) | |
parent | 28c8e4790ca5ef75f54895ca46437f9fbb433ddf (diff) | |
download | linux-fsl-qoriq-6b08f516244abda22c07b5e7db10ef109dc43f2d.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_ethtool.c
With merge conflict help from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 9f07e74..34432b4 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 @@ -569,7 +570,6 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb) C(len); C(data_len); C(mac_len); - C(rxhash); n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len; n->cloned = 1; n->nohdr = 0; |