diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-01-28 07:07:18 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-29 15:19:17 -0500 |
commit | 9e7234923789897858e1a475c579b5e2e6ad5b74 (patch) | |
tree | 69e97df9ff34f9237bfddee6e99100e8e16e1da1 /net/mac80211/tx.c | |
parent | eadc8d9e9047266a8914eb2ed4d36e797ce540d1 (diff) |
mac80211: A-MPDU Tx adding qdisc support
This patch allows qdisc support in A-MPDU Tx. a method to
handle QoS <-> TID switches is present in this patch.
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 85d01646abf5..38e1b2bd8245 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1260,6 +1260,8 @@ int ieee80211_master_start_xmit(struct sk_buff *skb, | |||
1260 | control.flags |= IEEE80211_TXCTL_REQUEUE; | 1260 | control.flags |= IEEE80211_TXCTL_REQUEUE; |
1261 | if (pkt_data->flags & IEEE80211_TXPD_EAPOL_FRAME) | 1261 | if (pkt_data->flags & IEEE80211_TXPD_EAPOL_FRAME) |
1262 | control.flags |= IEEE80211_TXCTL_EAPOL_FRAME; | 1262 | control.flags |= IEEE80211_TXCTL_EAPOL_FRAME; |
1263 | if (pkt_data->flags & IEEE80211_TXPD_AMPDU) | ||
1264 | control.flags |= IEEE80211_TXCTL_AMPDU; | ||
1263 | control.queue = pkt_data->queue; | 1265 | control.queue = pkt_data->queue; |
1264 | 1266 | ||
1265 | ret = ieee80211_tx(odev, skb, &control); | 1267 | ret = ieee80211_tx(odev, skb, &control); |