d80211: extend extra_hdr_room to be a bytecount
Subsystems (3)
PATCH 1/1 d80211: extend extra_hdr_room to be a bytecount
Extend ieee80211_hw's extra_hdr_room to be a bytecount for a device specific TX header instead of being a hardcoded 0/2 byte choice.
include/net/d80211.h +3 -4
@@ -476,10 +476,6 @@ struct ieee80211_hw {/* Force software encryption for TKIP packets if WMM is enabled. */ unsigned int no_tkip_wmm_hwaccel:1; -/* set if the payload needs to be padded at even boundaries after the -* header */ - unsigned int extra_hdr_room:1; -/* Some devices handle Michael MIC internally and do not include MIC in * the received packets passed up. device_strips_mic must be set * for such devices. The 'encryption' frame control bit is expected to
@@ -496,6 +492,9 @@ struct ieee80211_hw {* i.e. more than one skb per frame */ unsigned int fraglist:1; +/* Set to the size of a needed device specific skb headroom for TX skbs. */ +unsigned int extra_hdr_room; +/* This is the time in us to change channels */ int channel_change_time;
net/d80211/ieee80211.c +1 -1
@@ -1551,7 +1551,7 @@ static int ieee80211_subif_start_xmit(st* build in headroom in __dev_alloc_skb() (linux/skbuff.h) and * alloc_skb() (net/core/skbuff.c) */ - head_need = hdrlen + encaps_len + (local->hw->extra_hdr_room ?2 :0 ); + head_need = hdrlen + encaps_len + local->hw->extra_hdr_room; head_need -=skb_headroom (skb);/* We are going to modify skb data, so make a copy of it if happens to
Signature · 1 line
Greetings Michael.
Perhaps rename it to extra_tx_headroom?
- existing users would then need to take notice of the change
- the name 'extra_tx_headroom' is more descriptive of what it actually is
-David
Quoted 48 lines · Michael Buesch
Extend ieee80211_hw's
extra_hdr_roomto be a bytecount for a device specific TX header instead of being a hardcoded 0/2 byte choice.Signed-off-by Michael Buesch <[email protected]>include/net/d80211.h +3
-4@@ -476,10 +476,6 @@ struct ieee80211_hw {/* Force software encryption for TKIP packets if WMM is enabled. */ unsigned int no_tkip_wmm_hwaccel:1; -/* set if the payload needs to be padded at even boundaries after the -* header */ - unsigned int extra_hdr_room:1; -/* Some devices handle Michael MIC internally and do not include MIC in * the received packets passed up. device_strips_mic must be set * for such devices. The 'encryption' frame control bit is expected to @@ -496,6 +492,9 @@ struct ieee80211_hw {* i.e. more than one skb per frame */ unsigned int fraglist:1; +/* Set to the size of a needed device specific skb headroom for TX skbs. */ +unsigned int extra_hdr_room; +/* This is the time in us to change channels */ int channel_change_time;net/d80211/ieee80211.c +1
-1@@ -1551,7 +1551,7 @@ static int ieee80211_subif_start_xmit(st* build in headroom in __dev_alloc_skb() (linux/skbuff.h) and * alloc_skb() (net/core/skbuff.c) */ - head_need = hdrlen + encaps_len + (local->hw->extra_hdr_room ?2 :0 ); + head_need = hdrlen + encaps_len + local->hw->extra_hdr_room; head_need -=skb_headroom (skb);/* We are going to modify skb data, so make a copy of it if happens to Signature · 2 lines
-- Greetings Michael.
Quoted 3 lines · David Kimdon
Perhaps rename it to
extra_tx_headroom?
- existing users would then need to take notice of the change
- the name 'extra_tx_headroom' is more descriptive of what it actually is
Oh, yeah. This was lazyman's solution ;)
I will send an updated patch.
Signature · 1 line
Greetings Michael.
Quoted 3 lines · David Kimdon
Perhaps rename it to
extra_tx_headroom?
- existing users would then need to take notice of the change
- the name 'extra_tx_headroom' is more descriptive of what it actually is
Extend ieee80211_hw's extra_hdr_room to be a bytecount for a device specific TX header instead of being a hardcoded 0/2 byte choice.
Based on the patch by Michael Buesch <[email protected]>.
--- drivers/net/wireless/d80211/adm8211/adm8211.c | 2 +- drivers/net/wireless/d80211/rt2x00/rt2400pci.c | 2 +- drivers/net/wireless/d80211/rt2x00/rt2500pci.c | 2 +- drivers/net/wireless/d80211/rt2x00/rt2500usb.c | 2 +- drivers/net/wireless/d80211/rt2x00/rt61pci.c | 2 +- drivers/net/wireless/d80211/rt2x00/rt73usb.c | 2 +- include/net/d80211.h | 7 +++---- net/d80211/ieee80211.c | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-)
drivers/net/wireless/d80211/adm8211/adm8211.c +1 -1
@@ -2018,7 +2018,7 @@ static int __devinit adm8211_probe(struc hw->wep_include_iv =1 ; hw->data_nullfunc_ack =0 ; hw->no_tkip_wmm_hwaccel =1 ; - hw->extra_hdr_room =0 ; + hw->extra_tx_headroom =0 ; hw->device_strips_mic =0 ; hw->monitor_during_oper =0 ; hw->fraglist =0 ;
drivers/net/wireless/d80211/rt2x00/rt2400pci.c +1 -1
@@ -2578,7 +2578,7 @@ static int rt2400pci_init_hw(struct rt2x hw->wep_include_iv =1 ; hw->data_nullfunc_ack =1 ; hw->no_tkip_wmm_hwaccel =1 ; - hw->extra_hdr_room =0 ; + hw->extra_tx_headroom =0 ; hw->device_strips_mic =0 ; hw->monitor_during_oper =1 ; hw->fraglist =0 ;
drivers/net/wireless/d80211/rt2x00/rt2500pci.c +1 -1
@@ -2732,7 +2732,7 @@ static int rt2500pci_init_hw(struct rt2x hw->wep_include_iv =1 ; hw->data_nullfunc_ack =1 ; hw->no_tkip_wmm_hwaccel =1 ; - hw->extra_hdr_room =0 ; + hw->extra_tx_headroom =0 ; hw->device_strips_mic =0 ; hw->monitor_during_oper =1 ; hw->fraglist =0 ;
drivers/net/wireless/d80211/rt2x00/rt2500usb.c +1 -1
@@ -2419,7 +2419,7 @@ static int rt2500usb_init_hw(struct rt2x hw->wep_include_iv =1 ; hw->data_nullfunc_ack =1 ; hw->no_tkip_wmm_hwaccel =1 ; - hw->extra_hdr_room =0 ; + hw->extra_tx_headroom =0 ; hw->device_strips_mic =0 ; hw->monitor_during_oper =1 ; hw->fraglist =0 ;
drivers/net/wireless/d80211/rt2x00/rt61pci.c +1 -1
@@ -3252,7 +3252,7 @@ static int rt61pci_init_hw(struct rt2x00 hw->wep_include_iv =1 ; hw->data_nullfunc_ack =1 ; hw->no_tkip_wmm_hwaccel =1 ; - hw->extra_hdr_room =0 ; + hw->extra_tx_headroom =0 ; hw->device_strips_mic =0 ; hw->monitor_during_oper =1 ; hw->fraglist =0 ;
drivers/net/wireless/d80211/rt2x00/rt73usb.c +1 -1
@@ -2792,7 +2792,7 @@ static int rt73usb_init_hw(struct rt2x00 hw->wep_include_iv =1 ; hw->data_nullfunc_ack =1 ; hw->no_tkip_wmm_hwaccel =1 ; - hw->extra_hdr_room =0 ; + hw->extra_tx_headroom =0 ; hw->device_strips_mic =0 ; hw->monitor_during_oper =1 ; hw->fraglist =0 ;
include/net/d80211.h +3 -4
@@ -456,10 +456,6 @@ struct ieee80211_hw {/* Force software encryption for TKIP packets if WMM is enabled. */ unsigned int no_tkip_wmm_hwaccel:1; -/* set if the payload needs to be padded at even boundaries after the -* header */ - unsigned int extra_hdr_room:1; -/* Some devices handle Michael MIC internally and do not include MIC in * the received packets passed up. device_strips_mic must be set * for such devices. The 'encryption' frame control bit is expected to
@@ -476,6 +472,9 @@ struct ieee80211_hw {* i.e. more than one skb per frame */ unsigned int fraglist:1; +/* Set to the size of a needed device specific skb headroom for TX skbs. */ +unsigned int extra_tx_headroom; +/* This is the time in us to change channels */ int channel_change_time;
net/d80211/ieee80211.c +1 -1
@@ -1511,7 +1511,7 @@ static int ieee80211_subif_start_xmit(st* build in headroom in __dev_alloc_skb() (linux/skbuff.h) and * alloc_skb() (net/core/skbuff.c) */ - head_need = hdrlen + encaps_len + (local->hw->extra_hdr_room ?2 :0 ); + head_need = hdrlen + encaps_len + local->hw->extra_tx_headroom; head_need -=skb_headroom (skb);/* We are going to modify skb data, so make a copy of it if happens to
Signature · 2 lines
Jiri Benc SUSE Labs