--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -84,6 +84,34 @@
+@@ -84,6 +84,39 @@
*
*/
+ * of letting mac80211 push them via drv_tx().
+ * Other frames (e.g. control or management) are still pushed using drv_tx().
+ *
++ * Drivers indicate that they use this model by implementing the .wake_tx_queue
++ * driver operation.
++ *
+ * Intermediate queues (struct ieee80211_txq) are kept per-sta per-tid, with a
+ * single per-vif queue for multicast data frames.
+ *
+ * The driver is expected to initialize its private per-queue data for stations
+ * and interfaces in the .add_interface and .sta_add ops.
+ *
-+ * The driver can not access the queue directly. To dequeue a frame, it calls
++ * The driver can't access the queue directly. To dequeue a frame, it calls
+ * ieee80211_tx_dequeue(). Whenever mac80211 adds a new frame to a queue, it
+ * calls the .wake_tx_queue driver op.
+ *
+ * For AP powersave TIM handling, the driver only needs to indicate if it has
+ * buffered packets in the driver specific data structures by calling
+ * ieee80211_sta_set_buffered(). For frames buffered in the ieee80211_txq
-+ * struct, mac80211 sets TIM and calls .release_buffered_frames().
-+ * The driver is expected to release its own buffered frames and also call
-+ * ieee80211_tx_dequeue() within that callback.
++ * struct, mac80211 sets the appropriate TIM PVB bits and calls
++ * .release_buffered_frames().
++ * In that callback the driver is therefore expected to release its own
++ * buffered frames and afterwards also frames from the ieee80211_txq (obtained
++ * via the usual ieee80211_tx_dequeue).
+ */
+
struct device;
/**
-@@ -1257,6 +1285,8 @@ struct ieee80211_vif {
+@@ -1246,6 +1279,7 @@ enum ieee80211_vif_flags {
+ * monitor interface (if that is requested.)
+ * @drv_priv: data area for driver use, will always be aligned to
+ * sizeof(void *).
++ * @txq: the multicast data TX queue (if driver uses the TXQ abstraction)
+ */
+ struct ieee80211_vif {
+ enum nl80211_iftype type;
+@@ -1257,6 +1291,8 @@ struct ieee80211_vif {
u8 cab_queue;
u8 hw_queue[IEEE80211_NUM_ACS];
struct ieee80211_chanctx_conf __rcu *chanctx_conf;
u32 driver_flags;
-@@ -1519,6 +1549,8 @@ struct ieee80211_sta {
+@@ -1501,6 +1537,7 @@ struct ieee80211_sta_rates {
+ * @tdls_initiator: indicates the STA is an initiator of the TDLS link. Only
+ * valid if the STA is a TDLS peer in the first place.
+ * @mfp: indicates whether the STA uses management frame protection or not.
++ * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
+ */
+ struct ieee80211_sta {
+ u32 supp_rates[IEEE80211_NUM_BANDS];
+@@ -1519,6 +1556,8 @@ struct ieee80211_sta {
bool tdls_initiator;
bool mfp;
/* must be last */
u8 drv_priv[0] __aligned(sizeof(void *));
};
-@@ -1547,6 +1579,27 @@ struct ieee80211_tx_control {
+@@ -1547,6 +1586,27 @@ struct ieee80211_tx_control {
};
/**
+ * struct ieee80211_txq - Software intermediate tx queue
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
-+ * @sta: station table entry, may be NULL for per-vif queue
++ * @sta: station table entry, %NULL for per-vif queue
+ * @tid: the TID for this queue (unused for per-vif queue)
+ * @ac: the AC for this queue
+ *
* enum ieee80211_hw_flags - hardware flags
*
* These flags are used to indicate hardware capabilities to
-@@ -1770,6 +1823,8 @@ enum ieee80211_hw_flags {
+@@ -1770,6 +1830,8 @@ enum ieee80211_hw_flags {
* within &struct ieee80211_sta.
* @chanctx_data_size: size (in bytes) of the drv_priv data area
* within &struct ieee80211_chanctx_conf.
*
* @max_rates: maximum number of alternate rate retry stages the hw
* can handle.
-@@ -1818,6 +1873,9 @@ enum ieee80211_hw_flags {
+@@ -1818,6 +1880,9 @@ enum ieee80211_hw_flags {
* @n_cipher_schemes: a size of an array of cipher schemes definitions.
* @cipher_schemes: a pointer to an array of cipher scheme definitions
* supported by HW.
*/
struct ieee80211_hw {
struct ieee80211_conf conf;
-@@ -1830,6 +1888,7 @@ struct ieee80211_hw {
+@@ -1830,6 +1895,7 @@ struct ieee80211_hw {
int vif_data_size;
int sta_data_size;
int chanctx_data_size;
u16 queues;
u16 max_listen_interval;
s8 max_signal;
-@@ -1846,6 +1905,7 @@ struct ieee80211_hw {
+@@ -1846,6 +1912,7 @@ struct ieee80211_hw {
u8 uapsd_max_sp_len;
u8 n_cipher_schemes;
const struct ieee80211_cipher_scheme *cipher_schemes;
};
/**
-@@ -3007,6 +3067,8 @@ enum ieee80211_reconfig_type {
+@@ -3007,6 +3074,8 @@ enum ieee80211_reconfig_type {
* response template is provided, together with the location of the
* switch-timing IE within the template. The skb can only be used within
* the function call.
*/
struct ieee80211_ops {
void (*tx)(struct ieee80211_hw *hw,
-@@ -3238,6 +3300,9 @@ struct ieee80211_ops {
+@@ -3238,6 +3307,9 @@ struct ieee80211_ops {
void (*tdls_recv_channel_switch)(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
struct ieee80211_tdls_ch_sw_params *params);
};
/**
-@@ -5249,4 +5314,17 @@ void ieee80211_unreserve_tid(struct ieee
+@@ -5249,4 +5321,15 @@ void ieee80211_unreserve_tid(struct ieee
*/
size_t ieee80211_ie_split(const u8 *ies, size_t ielen,
const u8 *ids, int n_ids, size_t offset);
+ * ieee80211_tx_dequeue - dequeue a packet from a software tx queue
+ *
+ * @hw: pointer as obtained from ieee80211_alloc_hw()
-+ * @txq: pointer obtained from .add_tx_queue() call
++ * @txq: pointer obtained from station or virtual interface
+ *
-+ * Returns the skb if successful, NULL if no frame was available.
++ * Returns the skb if successful, %NULL if no frame was available.
+ */
+struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
+ struct ieee80211_txq *txq);
-+
-+
#endif /* MAC80211_H */
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
+ if (!check_sdata_in_driver(sdata))
+ return;
+
-+ trace_drv_wake_tx_queue(local, sdata, txq->txq.sta, txq->txq.tid);
++ trace_drv_wake_tx_queue(local, sdata, txq);
+ local->ops->wake_tx_queue(&local->hw, &txq->txq);
+}
+
static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)
{
-@@ -1905,6 +1923,12 @@ static inline bool ieee80211_can_run_wor
+@@ -1905,6 +1923,9 @@ static inline bool ieee80211_can_run_wor
return true;
}
+void ieee80211_init_tx_queue(struct ieee80211_sub_if_data *sdata,
+ struct sta_info *sta,
+ struct txq_info *txq, int tid);
-+void ieee80211_flush_tx_queue(struct ieee80211_local *local,
-+ struct ieee80211_txq *txq);
-+
void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
u16 transaction, u16 auth_alg, u16 status,
const u8 *extra, size_t extra_len, const u8 *bssid,
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -969,6 +969,9 @@ static void ieee80211_do_stop(struct iee
+@@ -969,6 +969,13 @@ static void ieee80211_do_stop(struct iee
}
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
-+ if (sdata->vif.txq)
-+ ieee80211_flush_tx_queue(local, sdata->vif.txq);
++ if (sdata->vif.txq) {
++ struct txq_info *txqi = to_txq_info(sdata->vif.txq);
++
++ ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
++ atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
++ }
+
if (local->open_count == 0)
ieee80211_clear_tx_pending(local);
-@@ -1773,6 +1776,15 @@ int ieee80211_if_add(struct ieee80211_lo
- ieee80211_setup_sdata(sdata, type);
+@@ -1674,6 +1681,7 @@ int ieee80211_if_add(struct ieee80211_lo
+ {
+ struct net_device *ndev = NULL;
+ struct ieee80211_sub_if_data *sdata = NULL;
++ struct txq_info *txqi;
+ int ret, i;
+ int txqs = 1;
- if (ndev) {
-+ struct txq_info *txqi = NULL;
-+
-+ if (local->ops->wake_tx_queue) {
-+ txqi = kzalloc(sizeof(*txqi) +
-+ local->hw.txq_data_size, GFP_KERNEL);
-+ if (txqi)
-+ ieee80211_init_tx_queue(sdata, NULL, txqi, 0);
+@@ -1693,10 +1701,18 @@ int ieee80211_if_add(struct ieee80211_lo
+ ieee80211_assign_perm_addr(local, wdev->address, type);
+ memcpy(sdata->vif.addr, wdev->address, ETH_ALEN);
+ } else {
++ int size = ALIGN(sizeof(*sdata) + local->hw.vif_data_size,
++ sizeof(void *));
++ int txq_size = 0;
++
++ if (local->ops->wake_tx_queue)
++ txq_size += sizeof(struct txq_info) +
++ local->hw.txq_data_size;
++
+ if (local->hw.queues >= IEEE80211_NUM_ACS)
+ txqs = IEEE80211_NUM_ACS;
+
+- ndev = alloc_netdev_mqs(sizeof(*sdata) + local->hw.vif_data_size,
++ ndev = alloc_netdev_mqs(size + txq_size,
+ name, NET_NAME_UNKNOWN,
+ ieee80211_if_setup, txqs, 1);
+ if (!ndev)
+@@ -1731,6 +1747,11 @@ int ieee80211_if_add(struct ieee80211_lo
+ memcpy(sdata->vif.addr, ndev->dev_addr, ETH_ALEN);
+ memcpy(sdata->name, ndev->name, IFNAMSIZ);
+
++ if (txq_size) {
++ txqi = netdev_priv(ndev) + size;
++ ieee80211_init_tx_queue(sdata, NULL, txqi, 0);
+ }
+
- if (params) {
- ndev->ieee80211_ptr->use_4addr = params->use_4addr;
- if (type == NL80211_IFTYPE_STATION)
-@@ -1785,6 +1797,7 @@ int ieee80211_if_add(struct ieee80211_lo
-
- ret = register_netdevice(ndev);
- if (ret) {
-+ kfree(txqi);
- free_netdev(ndev);
- return ret;
- }
-@@ -1810,6 +1823,9 @@ void ieee80211_if_remove(struct ieee8021
-
- synchronize_rcu();
-
-+ if (sdata->vif.txq)
-+ kfree(to_txq_info(sdata->vif.txq));
-+
- if (sdata->dev) {
- unregister_netdevice(sdata->dev);
- } else {
-@@ -1851,6 +1867,9 @@ void ieee80211_remove_interfaces(struct
- list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) {
- list_del(&sdata->list);
+ sdata->dev = ndev;
+ }
-+ if (sdata->vif.txq)
-+ kfree(to_txq_info(sdata->vif.txq));
-+
- if (sdata->dev)
- unregister_netdevice_queue(sdata->dev, &unreg_list);
- else
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1019,6 +1019,9 @@ int ieee80211_register_hw(struct ieee802
wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
-@@ -118,6 +118,11 @@ static void __cleanup_single_sta(struct
+@@ -118,6 +118,16 @@ static void __cleanup_single_sta(struct
atomic_dec(&ps->num_sta_ps);
}
+ if (sta->sta.txq[0]) {
-+ for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++)
-+ ieee80211_flush_tx_queue(local, sta->sta.txq[i]);
++ for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) {
++ struct txq_info *txqi = to_txq_info(sta->sta.txq[i]);
++ int n = skb_queue_len(&txqi->queue);
++
++ ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
++ atomic_sub(n, &sdata->txqs_len[txqi->txq.ac]);
++ }
+ }
+
for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
local->total_ps_buffered -= skb_queue_len(&sta->ps_tx_buf[ac]);
ieee80211_purge_tx_queue(&local->hw, &sta->ps_tx_buf[ac]);
-@@ -234,6 +239,8 @@ void sta_info_free(struct ieee80211_loca
+@@ -234,6 +244,8 @@ void sta_info_free(struct ieee80211_loca
sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);
kfree(rcu_dereference_raw(sta->sta.rates));
kfree(sta);
}
-@@ -285,11 +292,12 @@ struct sta_info *sta_info_alloc(struct i
+@@ -285,11 +297,12 @@ struct sta_info *sta_info_alloc(struct i
const u8 *addr, gfp_t gfp)
{
struct ieee80211_local *local = sdata->local;
if (!sta)
return NULL;
-@@ -321,11 +329,24 @@ struct sta_info *sta_info_alloc(struct i
+@@ -321,11 +334,25 @@ struct sta_info *sta_info_alloc(struct i
for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++)
ewma_init(&sta->chain_signal_avg[i], 1024, 8);
+
+ for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) {
+ struct txq_info *txq = txq_data + i * size;
++
+ ieee80211_init_tx_queue(sdata, sta, txq, i);
+ }
}
for (i = 0; i < IEEE80211_NUM_TIDS; i++) {
/*
* timer_to_tid must be initialized with identity mapping
-@@ -346,7 +367,7 @@ struct sta_info *sta_info_alloc(struct i
+@@ -346,7 +373,7 @@ struct sta_info *sta_info_alloc(struct i
if (sdata->vif.type == NL80211_IFTYPE_AP ||
sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
struct ieee80211_supported_band *sband =
u8 smps = (sband->ht_cap.cap & IEEE80211_HT_CAP_SM_PS) >>
IEEE80211_HT_CAP_SM_PS_SHIFT;
/*
-@@ -371,6 +392,13 @@ struct sta_info *sta_info_alloc(struct i
+@@ -371,6 +398,13 @@ struct sta_info *sta_info_alloc(struct i
sta_dbg(sdata, "Allocated STA %pM\n", sta->sta.addr);
return sta;
}
static int sta_info_insert_check(struct sta_info *sta)
-@@ -640,6 +668,8 @@ static void __sta_info_recalc_tim(struct
+@@ -640,6 +674,8 @@ static void __sta_info_recalc_tim(struct
indicate_tim |=
sta->driver_buffered_tids & tids;
}
done:
-@@ -1071,7 +1101,7 @@ void ieee80211_sta_ps_deliver_wakeup(str
+@@ -1071,7 +1107,7 @@ void ieee80211_sta_ps_deliver_wakeup(str
struct ieee80211_sub_if_data *sdata = sta->sdata;
struct ieee80211_local *local = sdata->local;
struct sk_buff_head pending;
unsigned long flags;
struct ps_data *ps;
-@@ -1090,10 +1120,22 @@ void ieee80211_sta_ps_deliver_wakeup(str
+@@ -1090,10 +1126,22 @@ void ieee80211_sta_ps_deliver_wakeup(str
BUILD_BUG_ON(BITS_TO_LONGS(IEEE80211_NUM_TIDS) > 1);
sta->driver_buffered_tids = 0;
skb_queue_head_init(&pending);
/* sync with ieee80211_tx_h_unicast_ps_buf */
-@@ -1254,7 +1296,7 @@ ieee80211_sta_ps_deliver_response(struct
- struct ieee80211_sub_if_data *sdata = sta->sdata;
- struct ieee80211_local *local = sdata->local;
- bool more_data = false;
-- int ac;
-+ int ac, tid;
- unsigned long driver_release_tids = 0;
- struct sk_buff_head frames;
-
-@@ -1275,8 +1317,10 @@ ieee80211_sta_ps_deliver_response(struct
+@@ -1275,8 +1323,10 @@ ieee80211_sta_ps_deliver_response(struct
/* if we already have frames from software, then we can't also
* release from hardware queues
*/
if (driver_release_tids) {
/* If the driver has data on more than one TID then
-@@ -1447,6 +1491,8 @@ ieee80211_sta_ps_deliver_response(struct
+@@ -1447,6 +1497,9 @@ ieee80211_sta_ps_deliver_response(struct
sta_info_recalc_tim(sta);
} else {
+ unsigned long tids = sta->txq_buffered_tids & driver_release_tids;
++ int tid;
+
/*
* We need to release a frame that is buffered somewhere in the
* driver ... it'll have to handle that.
-@@ -1466,8 +1512,22 @@ ieee80211_sta_ps_deliver_response(struct
+@@ -1466,8 +1519,22 @@ ieee80211_sta_ps_deliver_response(struct
* that the TID(s) became empty before returning here from the
* release function.
* Either way, however, when the driver tells us that the TID(s)
unsigned long rx_packets;
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
-@@ -2312,6 +2312,34 @@ TRACE_EVENT(drv_tdls_recv_channel_switch
+@@ -2312,6 +2312,37 @@ TRACE_EVENT(drv_tdls_recv_channel_switch
)
);
+TRACE_EVENT(drv_wake_tx_queue,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
-+ struct ieee80211_sta *sta,
-+ u8 tid),
++ struct txq_info *txq),
+
-+ TP_ARGS(local, sdata, sta, tid),
++ TP_ARGS(local, sdata, txq),
+
+ TP_STRUCT__entry(
+ LOCAL_ENTRY
+ VIF_ENTRY
+ STA_ENTRY
++ __field(u8, ac)
+ __field(u8, tid)
+ ),
+
+ TP_fast_assign(
++ struct ieee80211_sta *sta = txq->txq.sta;
++
+ LOCAL_ASSIGN;
+ VIF_ASSIGN;
+ STA_ASSIGN;
-+ __entry->tid = tid;
++ __entry->ac = txq->txq.ac;
++ __entry->tid = txq->txq.tid;
+ ),
+
+ TP_printk(
-+ LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " tid: 0x%x",
-+ LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->tid
++ LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " ac:%d tid:%d",
++ LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ac, __entry->tid
+ )
+);
+
#define TRACE_SYSTEM mac80211_msg
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
-@@ -776,12 +776,23 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+@@ -776,12 +776,22 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
return TX_CONTINUE;
}
-+static u16
-+ieee80211_tx_next_seq(struct sta_info *sta, int tid)
++static __le16 ieee80211_tx_next_seq(struct sta_info *sta, int tid)
+{
+ u16 *seq = &sta->tid_seq[tid];
-+ u16 ret = cpu_to_le16(*seq);
++ __le16 ret = cpu_to_le16(*seq);
+
+ /* Increase the sequence number. */
+ *seq = (*seq + 0x10) & IEEE80211_SCTL_SEQ;
u8 *qc;
int tid;
-@@ -832,13 +843,10 @@ ieee80211_tx_h_sequence(struct ieee80211
+@@ -832,13 +842,10 @@ ieee80211_tx_h_sequence(struct ieee80211
qc = ieee80211_get_qos_ctl(hdr);
tid = *qc & IEEE80211_QOS_CTL_TID_MASK;
return TX_CONTINUE;
}
-@@ -1067,7 +1075,7 @@ static bool ieee80211_tx_prep_agg(struct
+@@ -1067,7 +1074,7 @@ static bool ieee80211_tx_prep_agg(struct
* nothing -- this aggregation session is being started
* but that might still fail with the driver
*/
spin_lock(&tx->sta->lock);
/*
* Need to re-check now, because we may get here
-@@ -1201,13 +1209,101 @@ ieee80211_tx_prepare(struct ieee80211_su
+@@ -1201,13 +1208,102 @@ ieee80211_tx_prepare(struct ieee80211_su
return TX_CONTINUE;
}
+ struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ struct ieee80211_tx_control control = {
-+ .sta = pubsta
++ .sta = pubsta,
+ };
+ struct ieee80211_txq *txq = NULL;
+ struct txq_info *txqi;
+
+ if (pubsta) {
+ u8 tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
++
+ txq = pubsta->txq[tid];
+ } else if (vif) {
+ txq = vif->txq;
+ goto tx_normal;
+
+ ac = txq->ac;
-+ txqi = container_of(txq, struct txq_info, txq);
++ txqi = to_txq_info(txq);
+ atomic_inc(&sdata->txqs_len[ac]);
+ if (atomic_read(&sdata->txqs_len[ac]) >= local->hw.txq_ac_max_pending)
+ netif_stop_subqueue(sdata->dev, ac);
if (ac_queue == queue ||
(sdata->vif.cab_queue == queue &&
local->queue_stop_reasons[ac_queue] == 0 &&
-@@ -3307,3 +3312,36 @@ u8 *ieee80211_add_wmm_info_ie(u8 *buf, u
+@@ -3307,3 +3312,20 @@ u8 *ieee80211_add_wmm_info_ie(u8 *buf, u
return buf;
}
+ txqi->txq.ac = IEEE80211_AC_BE;
+ }
+}
-+
-+void ieee80211_flush_tx_queue(struct ieee80211_local *local,
-+ struct ieee80211_txq *txq)
-+{
-+ struct txq_info *txqi = container_of(txq, struct txq_info, txq);
-+ struct ieee80211_sub_if_data *sdata = vif_to_sdata(txq->vif);
-+ struct sk_buff *skb;
-+ int n = 0;
-+
-+ while ((skb = skb_dequeue(&txqi->queue)) != NULL) {
-+ n++;
-+ ieee80211_free_txskb(&local->hw, skb);
-+ }
-+
-+ atomic_sub(n, &sdata->txqs_len[txq->ac]);
-+}
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1176,6 +1176,7 @@ static void sta_ps_start(struct sta_info
static void sta_ps_end(struct sta_info *sta)
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
-@@ -188,6 +188,41 @@ ieee80211_wake_queue_agg(struct ieee8021
+@@ -188,6 +188,43 @@ ieee80211_wake_queue_agg(struct ieee8021
__release(agg_queue);
}
+ return;
+
+ txqi = to_txq_info(txq);
++
++ /* Lock here to protect against further seqno updates on dequeue */
+ spin_lock_bh(&txqi->queue.lock);
+ set_bit(IEEE80211_TXQ_STOP, &txqi->flags);
+ spin_unlock_bh(&txqi->queue.lock);
/*
* splice packets from the STA's pending to the local pending,
* requires a call to ieee80211_agg_splice_finish later
-@@ -247,6 +282,7 @@ static void ieee80211_remove_tid_tx(stru
+@@ -247,6 +284,7 @@ static void ieee80211_remove_tid_tx(stru
ieee80211_assign_tid_tx(sta, tid, NULL);
ieee80211_agg_splice_finish(sta->sdata, tid);
kfree_rcu(tid_tx, rcu_head);
}
-@@ -418,6 +454,8 @@ void ieee80211_tx_ba_session_handle_star
+@@ -418,6 +456,8 @@ void ieee80211_tx_ba_session_handle_star
*/
clear_bit(HT_AGG_STATE_WANT_START, &tid_tx->state);
/*
* Make sure no packets are being processed. This ensures that
* we have a valid starting sequence number and that in-flight
-@@ -440,6 +478,8 @@ void ieee80211_tx_ba_session_handle_star
+@@ -440,6 +480,8 @@ void ieee80211_tx_ba_session_handle_star
ieee80211_agg_splice_finish(sdata, tid);
spin_unlock_bh(&sta->lock);
kfree_rcu(tid_tx, rcu_head);
return;
}
-@@ -666,6 +706,8 @@ static void ieee80211_agg_tx_operational
+@@ -666,6 +708,8 @@ static void ieee80211_agg_tx_operational
ieee80211_agg_splice_finish(sta->sdata, tid);
spin_unlock_bh(&sta->lock);
projects / oweals / openwrt.git / blobdiff