diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-10-07 14:01:26 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 16:41:19 -0400 |
| commit | 73b9f03a813d66484105c4ed648a1aa66fa267aa (patch) | |
| tree | 37a60a9c61f4537c898a5d863e93f1b445864d7d /include/net/mac80211.h | |
| parent | a26eb27ab430147a82e4a9f2f1ebfadf03d99550 (diff) | |
mac80211: parse radiotap header earlier
We can now move the radiotap header parsing into
ieee80211_monitor_start_xmit(). This moves it out of
the hotpath, and also helps the code since now the
radiotap header will no longer be present in
ieee80211_xmit() etc. which is easier to understand.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 05f102197cfe..021317367d55 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -349,8 +349,6 @@ struct ieee80211_bss_conf { * @IEEE80211_TX_INTFL_RETRANSMISSION: This frame is being retransmitted * after TX status because the destination was asleep, it must not * be modified again (no seqno assignment, crypto, etc.) - * @IEEE80211_TX_INTFL_HAS_RADIOTAP: This frame was injected and still - * has a radiotap header at skb->data. * @IEEE80211_TX_INTFL_NL80211_FRAME_TX: Frame was requested through nl80211 * MLME command (internal to mac80211 to figure out whether to send TX * status to user space) @@ -402,7 +400,7 @@ enum mac80211_tx_control_flags { IEEE80211_TX_CTL_POLL_RESPONSE = BIT(17), IEEE80211_TX_CTL_MORE_FRAMES = BIT(18), IEEE80211_TX_INTFL_RETRANSMISSION = BIT(19), - IEEE80211_TX_INTFL_HAS_RADIOTAP = BIT(20), + /* hole at 20, use later */ IEEE80211_TX_INTFL_NL80211_FRAME_TX = BIT(21), IEEE80211_TX_CTL_LDPC = BIT(22), IEEE80211_TX_CTL_STBC = BIT(23) | BIT(24), |