diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 03:46:21 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 03:46:21 +0100 |
| commit | 0c864d8b3e51bd61f43484268c9aa4eb9a199b02 (patch) | |
| tree | de9fa5c3792c84fa173e6d27c856bde0254f7eeb /net/mac80211/ieee80211_i.h | |
| parent | usb: dwc3: core: move dwc3_cache_hwparams before dwc3_alloc_event_buffers (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | linux-0c864d8b3e51bd61f43484268c9aa4eb9a199b02.tar.xz linux-0c864d8b3e51bd61f43484268c9aa4eb9a199b02.zip | |
Merge 3.7-rc6 into usb-next.
This resolves a conflict with these files:
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 8c804550465b..156e5835e37f 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1314,6 +1314,8 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev); +void ieee80211_purge_tx_queue(struct ieee80211_hw *hw, + struct sk_buff_head *skbs); /* HT */ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata, |