2009-07-01 21:18:06

by Larry Finger

Subject: [PATCH] net: remove skb->do_not_encrypt from skbuff.c

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 <[email protected]>
---

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);
}

2009-07-02 06:16:51

by Kalle Valo

Subject: Re: [PATCH] net: remove skb->do_not_encrypt from skbuff.c

Larry Finger <[email protected]> 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 <[email protected]>

Tested-by: Kalle Valo <[email protected]>

> 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