summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-21 11:54:49 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-21 11:54:49 -0800
commited4b2019a62e2208a8370461dd91ed4de2c9fc8f (patch)
tree2910816b23718e9cebd20be9eae2b6876edd849b /include/net
parentb74665606962456af7f92b1e448cee30ce70967b (diff)
parent92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff)
downloadlinux-3.10-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.tar.gz
linux-3.10-ed4b2019a62e2208a8370461dd91ed4de2c9fc8f.tar.bz2
linux-3.10-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.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 2aff4906b2a..538d6b76188 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
*