diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 16:33:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 16:33:00 -0700 |
commit | 38afd6adf6bccd7176e88c07cac104d3639aa30d (patch) | |
tree | 2142409984b609e51ef60b6a14318dd4e878718a /net/core/skbuff.c | |
parent | 8ed1383fb7b6685968588141d5934e0e6715e954 (diff) | |
parent | 261688d01ec07d3a265b8ace6ec68310fbd96a96 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d9f7b06fe88..7eab867ede5 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -377,8 +377,8 @@ struct sk_buff *skb_clone(struct sk_buff *skb, unsigned int __nocast gfp_mask) C(tc_index); #ifdef CONFIG_NET_CLS_ACT n->tc_verd = SET_TC_VERD(skb->tc_verd,0); - n->tc_verd = CLR_TC_OK2MUNGE(skb->tc_verd); - n->tc_verd = CLR_TC_MUNGED(skb->tc_verd); + n->tc_verd = CLR_TC_OK2MUNGE(n->tc_verd); + n->tc_verd = CLR_TC_MUNGED(n->tc_verd); C(input_dev); C(tc_classid); #endif |