* [PATCH] net: remove skb->do_not_encrypt from skbuff.c
@ 2009-07-01 21:18 Larry Finger
2009-07-02 6:16 ` Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Larry Finger @ 2009-07-01 21:18 UTC (permalink / raw)
To: John W Linville, Johannes Berg; +Cc: linux-wireless
Commit 38ba8fb67d6be3258a ("net: remove unused skb->do_not_encrypt")
removed the variable from struct skbuff, but the usage in net/core/skbuff.c
crept back in, probably in the merge between mainline and wireless-testing.
Signed-off-by: Larry.Finger <Larry.Finger@lwfinger.net>
---
John,
This fixes the build problem I reported earlier.
Larry
---
Index: wireless-testing/net/core/skbuff.c
===================================================================
--- wireless-testing.orig/net/core/skbuff.c
+++ wireless-testing/net/core/skbuff.c
@@ -559,9 +559,6 @@ static void __copy_skb_header(struct sk_
#endif
#endif
new->vlan_tci = old->vlan_tci;
-#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
- new->do_not_encrypt = old->do_not_encrypt;
-#endif
skb_copy_secmark(new, old);
}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] net: remove skb->do_not_encrypt from skbuff.c
2009-07-01 21:18 [PATCH] net: remove skb->do_not_encrypt from skbuff.c Larry Finger
@ 2009-07-02 6:16 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2009-07-02 6:16 UTC (permalink / raw)
To: Larry Finger; +Cc: John W Linville, Johannes Berg, linux-wireless
Larry Finger <Larry.Finger@lwfinger.net> writes:
> Commit 38ba8fb67d6be3258a ("net: remove unused skb->do_not_encrypt")
> removed the variable from struct skbuff, but the usage in net/core/skbuff.c
> crept back in, probably in the merge between mainline and wireless-testing.
>
> Signed-off-by: Larry.Finger <Larry.Finger@lwfinger.net>
Tested-by: Kalle Valo <kalle.valo@iki.fi>
> John,
>
> This fixes the build problem I reported earlier.
I had exactly the same error. Thanks for fixing this.
John, try to push this to wireless-testing at your earliest convenience
because this fixes a compilation error.
--
Kalle Valo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-07-02 6:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-01 21:18 [PATCH] net: remove skb->do_not_encrypt from skbuff.c Larry Finger
2009-07-02 6:16 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox