diff options
| author | David S. Miller | 2009-12-21 20:54:49 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-12-21 20:54:49 +0100 |
| commit | ed4b2019a62e2208a8370461dd91ed4de2c9fc8f (patch) | |
| tree | 2910816b23718e9cebd20be9eae2b6876edd849b /include/net | |
| parent | bnx2: Fix bnx2_netif_stop() merge error. (diff) | |
| parent | ps3_gelic_wireless: Fix build failure due to missing WEXT_PRIV (diff) | |
| download | kernel-qcow2-linux-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.tar.gz kernel-qcow2-linux-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.tar.xz kernel-qcow2-linux-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 2aff4906b2ae..538d6b761887 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1737,6 +1737,12 @@ static inline void ieee80211_rx_ni(struct ieee80211_hw *hw, local_bh_enable(); } +/* + * The TX headroom reserved by mac80211 for its own tx_status functions. + * This is enough for the radiotap header. + */ +#define IEEE80211_TX_STATUS_HEADROOM 13 + /** * ieee80211_tx_status - transmit status callback * |