* [SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark
@ 2007-06-23 10:53 Patrick McHardy
2007-06-23 15:02 ` James Morris
0 siblings, 1 reply; 3+ messages in thread
From: Patrick McHardy @ 2007-06-23 10:53 UTC (permalink / raw)
To: James Morris; +Cc: Linux Netdev List
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: x --]
[-- Type: text/plain, Size: 547 bytes --]
[SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark
secmark doesn't depend on CONFIG_NET_SCHED.
Signed-off-by: Patrick McHardy <kaber@trash.net>
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 7c6a34e..8d43ae6 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -434,8 +434,8 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
n->tc_verd = CLR_TC_MUNGED(n->tc_verd);
C(iif);
#endif
- skb_copy_secmark(n, skb);
#endif
+ skb_copy_secmark(n, skb);
C(truesize);
atomic_set(&n->users, 1);
C(head);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark
2007-06-23 10:53 [SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark Patrick McHardy
@ 2007-06-23 15:02 ` James Morris
2007-06-24 5:59 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: James Morris @ 2007-06-23 15:02 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Linux Netdev List
Thanks.
Acked-by: James Morris <jmorris@namei.org>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark
2007-06-23 15:02 ` James Morris
@ 2007-06-24 5:59 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2007-06-24 5:59 UTC (permalink / raw)
To: jmorris; +Cc: kaber, netdev
From: James Morris <jmorris@namei.org>
Date: Sat, 23 Jun 2007 11:02:54 -0400 (EDT)
> Thanks.
>
> Acked-by: James Morris <jmorris@namei.org>
Applied, thanks everyone.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-06-24 5:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-23 10:53 [SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark Patrick McHardy
2007-06-23 15:02 ` James Morris
2007-06-24 5:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).