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>
This commit is contained in:
Родитель
3b8d81e020
Коммит
72bce62775
|
@ -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
|
||||
|
@ -379,13 +378,10 @@ struct sk_buff {
|
|||
kmemcheck_bitfield_begin(flags2);
|
||||
#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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче