summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-06-17 17:45:28 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-24 15:05:31 -0400
commit72bce62775db0315511474e8d8f8e25d25b48366 (patch)
tree7e97b6a26e0f8e7f8913c6cbd024e6d80e9a3e11 /net/core
parent3b8d81e020f77c9da8b85b0685c8cd2ca7c7b150 (diff)
downloadblackbird-op-linux-72bce62775db0315511474e8d8f8e25d25b48366.tar.gz
blackbird-op-linux-72bce62775db0315511474e8d8f8e25d25b48366.zip
net: remove unused skb->do_not_encrypt
mac80211 required this due to the master netdev, but now it can put all information into skb->cb and this can go. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/skbuff.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 9e0597d189b0..80a96166df39 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -559,9 +559,6 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
#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);
}
OpenPOWER on IntegriCloud