aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-11-18 12:42:47 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-18 17:09:27 -0500
commitfe7a5d5c1ad659bf0ec7dc171e122aeefa16ac25 (patch)
treeaefd9ef2b3220f1a6dc701ebf208ec951221de45 /net/mac80211/ieee80211_i.h
parent62ae67be31c2346b6d74653a148ddbd1b9a94424 (diff)
mac80211: move TX status handling
It's enough code to have its own file, I think. Especially since I'm going to add to it. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 598db7cbeb44..74e79935de0a 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -23,6 +23,7 @@
23#include <linux/types.h> 23#include <linux/types.h>
24#include <linux/spinlock.h> 24#include <linux/spinlock.h>
25#include <linux/etherdevice.h> 25#include <linux/etherdevice.h>
26#include <net/ieee80211_radiotap.h>
26#include <net/cfg80211.h> 27#include <net/cfg80211.h>
27#include <net/mac80211.h> 28#include <net/mac80211.h>
28#include "key.h" 29#include "key.h"
@@ -948,6 +949,18 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb,
948netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, 949netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
949 struct net_device *dev); 950 struct net_device *dev);
950 951
952/*
953 * radiotap header for status frames
954 */
955struct ieee80211_tx_status_rtap_hdr {
956 struct ieee80211_radiotap_header hdr;
957 u8 rate;
958 u8 padding_for_rate;
959 __le16 tx_flags;
960 u8 data_retries;
961} __attribute__ ((packed));
962
963
951/* HT */ 964/* HT */
952void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband, 965void ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_supported_band *sband,
953 struct ieee80211_ht_cap *ht_cap_ie, 966 struct ieee80211_ht_cap *ht_cap_ie,