diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-06-17 17:45:28 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:31 -0400 |
| commit | 72bce62775db0315511474e8d8f8e25d25b48366 (patch) | |
| tree | 7e97b6a26e0f8e7f8913c6cbd024e6d80e9a3e11 /include/linux/skbuff.h | |
| parent | 3b8d81e020f77c9da8b85b0685c8cd2ca7c7b150 (diff) | |
| download | linux-72bce62775db0315511474e8d8f8e25d25b48366.tar.gz linux-72bce62775db0315511474e8d8f8e25d25b48366.tar.bz2 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 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index f2c69a2cca17..df7b23ac66e6 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -304,7 +304,6 @@ typedef unsigned char *sk_buff_data_t; * @tc_index: Traffic control index * @tc_verd: traffic control verdict * @ndisc_nodetype: router type (from link layer) - * @do_not_encrypt: set to prevent encryption of this frame * @dma_cookie: a cookie to one of several possible DMA operations * done by skb DMA functions * @secmark: security marking @@ -380,12 +379,9 @@ struct sk_buff { #ifdef CONFIG_IPV6_NDISC_NODETYPE __u8 ndisc_nodetype:2; #endif -#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE) - __u8 do_not_encrypt:1; -#endif kmemcheck_bitfield_end(flags2); - /* 0/13/14 bit hole */ + /* 0/14 bit hole */ #ifdef CONFIG_NET_DMA dma_cookie_t dma_cookie; |