android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: let the driver reserve extra tailroom in beacons

Browse Source 
Can be used to add extra IEs (such as P2P NoA) without having to
reallocate the buffer.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Felix Fietkau 2013-12-14 13:54:53 +01:00 committed by Johannes Berg
parent 7907c7d33c
commit 70dabeb74e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/mac80211.h
View File

@ -1613,6 +1613,9 @@ enum ieee80211_hw_flags {
* @extra_tx_headroom: headroom to reserve in each transmit skb * @extra_tx_headroom: headroom to reserve in each transmit skb
* for use by the driver (e.g. for transmit headers.) * for use by the driver (e.g. for transmit headers.)
* *
* @extra_beacon_tailroom: tailroom to reserve in each beacon tx skb.
* Can be used by drivers to add extra IEs.
*
* @channel_change_time: time (in microseconds) it takes to change channels. * @channel_change_time: time (in microseconds) it takes to change channels.
* *
* @max_signal: Maximum value for signal (rssi) in RX information, used * @max_signal: Maximum value for signal (rssi) in RX information, used
@ -1695,6 +1698,7 @@ struct ieee80211_hw {
void *priv; void *priv;
u32 flags; u32 flags;
unsigned int extra_tx_headroom; unsigned int extra_tx_headroom;
unsigned int extra_beacon_tailroom;
int channel_change_time; int channel_change_time;
int vif_data_size; int vif_data_size;
int sta_data_size; int sta_data_size;

9
net/mac80211/tx.c
View File

@ -2549,7 +2549,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
*/ */
skb = dev_alloc_skb(local->tx_headroom + skb = dev_alloc_skb(local->tx_headroom +
beacon->head_len + beacon->head_len +
beacon->tail_len + 256); beacon->tail_len + 256 +
local->hw.extra_beacon_tailroom);
if (!skb) if (!skb)
goto out; goto out;
@ -2581,7 +2582,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
ieee80211_update_csa(sdata, presp); ieee80211_update_csa(sdata, presp);
skb = dev_alloc_skb(local->tx_headroom + presp->head_len); skb = dev_alloc_skb(local->tx_headroom + presp->head_len +
local->hw.extra_beacon_tailroom);
if (!skb) if (!skb)
goto out; goto out;
skb_reserve(skb, local->tx_headroom); skb_reserve(skb, local->tx_headroom);
@ -2608,7 +2610,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
skb = dev_alloc_skb(local->tx_headroom + skb = dev_alloc_skb(local->tx_headroom +
bcn->head_len + bcn->head_len +
256 + /* TIM IE */ 256 + /* TIM IE */
bcn->tail_len); bcn->tail_len +
local->hw.extra_beacon_tailroom);
if (!skb) if (!skb)
goto out; goto out;
skb_reserve(skb, local->tx_headroom); skb_reserve(skb, local->tx_headroom);