diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-06-17 11:45:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:31 -0400 |
commit | 72bce62775db0315511474e8d8f8e25d25b48366 (patch) | |
tree | 7e97b6a26e0f8e7f8913c6cbd024e6d80e9a3e11 /net/core/skbuff.c | |
parent | 3b8d81e020f77c9da8b85b0685c8cd2ca7c7b150 (diff) |
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/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 3 |
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) | |||
559 | #endif | 559 | #endif |
560 | #endif | 560 | #endif |
561 | new->vlan_tci = old->vlan_tci; | 561 | new->vlan_tci = old->vlan_tci; |
562 | #if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE) | ||
563 | new->do_not_encrypt = old->do_not_encrypt; | ||
564 | #endif | ||
565 | 562 | ||
566 | skb_copy_secmark(new, old); | 563 | skb_copy_secmark(new, old); |
567 | } | 564 | } |