summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2017-08-24 13:29:12 +0200
committerKalle Valo <kvalo@codeaurora.org>2017-08-24 13:47:42 +0200
commit5307eca1362492ce28f1572b430997d9053c021d (patch)
tree83402432406875153d24aa6434437b6cbfccc2f8 /include
parentwireless: ipw2x00: make iw_handler_def const (diff)
parentbrcmfmac: feature check for multi-scheduled scan fails on bcm4343x devices (diff)
downloadlinux-5307eca1362492ce28f1572b430997d9053c021d.tar.xz
linux-5307eca1362492ce28f1572b430997d9053c021d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
Stephen Rothwell reported quite a few conflicts in iwlwifi between wireless-drivers and wireless-drivers-next. To avoid any problems later in other trees merge w-d to w-d-next to fix those conflicts early.
Diffstat (limited to 'include')
-rw-r--r--include/net/mac80211.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index b2b5419467cc..f8149ca192b4 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -5499,6 +5499,21 @@ static inline void ieee80211_stop_rx_ba_session_offl(struct ieee80211_vif *vif,
ieee80211_manage_rx_ba_offl(vif, addr, tid + IEEE80211_NUM_TIDS);
}
+/**
+ * ieee80211_rx_ba_timer_expired - stop a Rx BA session due to timeout
+ *
+ * Some device drivers do not offload AddBa/DelBa negotiation, but handle rx
+ * buffer reording internally, and therefore also handle the session timer.
+ *
+ * Trigger the timeout flow, which sends a DelBa.
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback
+ * @addr: station mac address
+ * @tid: the rx tid
+ */
+void ieee80211_rx_ba_timer_expired(struct ieee80211_vif *vif,
+ const u8 *addr, unsigned int tid);
+
/* Rate control API */
/**