| Message ID | 20170805084438.12550-8-luca@coelho.fi (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Johannes Berg |
| Headers | show |
Hi Naftali, [auto build test WARNING on linus/master] [also build test WARNING on v4.13-rc3 next-20170804] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Luca-Coelho/mac80211-patches-from-our-internal-tree-2017-08-05/20170806-053032 reproduce: make htmldocs All warnings (new ones prefixed by >>): WARNING: convert(1) not found, for SVG to PDF conversion install ImageMagick (https://www.imagemagick.org) >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' >> include/net/mac80211.h:5515: warning: No description found for parameter 'bit' >> include/net/mac80211.h:5515: warning: Excess function parameter 'tid' description in 'ieee80211_rx_ba_timer_expired' vim +/bit +5515 include/net/mac80211.h 5501 5502 /** 5503 * ieee80211_rx_ba_timer_expired - stop a Rx BA session due to timeout 5504 * 5505 * Some device drivers do not offload AddBa/DelBa negotiation, but handle rx 5506 * buffer reording internally, and therefore also handle the session timer. 5507 * 5508 * Trigger the timeout flow, which sends a DelBa. 5509 * 5510 * @vif: &struct ieee80211_vif pointer from the add_interface callback 5511 * @addr: station mac address 5512 * @tid: the rx tid 5513 */ 5514 void ieee80211_rx_ba_timer_expired(struct ieee80211_vif *vif, > 5515 const u8 *addr, unsigned int bit); 5516 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b2b5419467cc..64f5abb02030 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 bit); + /* Rate control API */ /** diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index 8708cbe8af5b..34599bd38991 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -7,7 +7,7 @@ * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz> * Copyright 2007, Michael Wu <flamingice@sourmilk.net> * Copyright 2007-2010, Intel Corporation - * Copyright(c) 2015 Intel Deutschland GmbH + * Copyright(c) 2015-2017 Intel Deutschland GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -466,3 +466,23 @@ void ieee80211_manage_rx_ba_offl(struct ieee80211_vif *vif, rcu_read_unlock(); } EXPORT_SYMBOL(ieee80211_manage_rx_ba_offl); + +void ieee80211_rx_ba_timer_expired(struct ieee80211_vif *vif, + const u8 *addr, unsigned int bit) +{ + struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); + struct ieee80211_local *local = sdata->local; + struct sta_info *sta; + + rcu_read_lock(); + sta = sta_info_get_bss(sdata, addr); + if (!sta) + goto unlock; + + set_bit(bit, sta->ampdu_mlme.tid_rx_timer_expired); + ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work); + + unlock: + rcu_read_unlock(); +} +EXPORT_SYMBOL(ieee80211_rx_ba_timer_expired);