diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 12:57:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 12:57:56 -0500 |
commit | b3117494772d8f906625905c6e203af745ee3530 (patch) | |
tree | cc8960455f9e1f18d0939fddd0e96f349613f753 /net/mac80211/ieee80211_i.h | |
parent | e2ff0498409af6f2023f91aba07b281e5e87ee15 (diff) | |
parent | 400e020892a9a20eea5d2c9bce8bfb312075c4ba (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index e1fb97cc9a41..74748896d77b 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -1388,6 +1388,8 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, | |||
1388 | struct net_device *dev); | 1388 | struct net_device *dev); |
1389 | netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, | 1389 | netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, |
1390 | struct net_device *dev); | 1390 | struct net_device *dev); |
1391 | void ieee80211_purge_tx_queue(struct ieee80211_hw *hw, | ||
1392 | struct sk_buff_head *skbs); | ||
1391 | 1393 | ||
1392 | /* HT */ | 1394 | /* HT */ |
1393 | void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata, | 1395 | void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata, |