diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-01-05 17:18:59 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-05 17:18:59 -0500 |
commit | 4f9b2a7dea2bf1dd81f280aa5e8a40ed910d2f0a (patch) | |
tree | 52046049957a87103a383869155f43461963f089 /net/mac80211/tx.c | |
parent | f3f66b69c8ff08b46975d9e99c7ecb92a8b12eda (diff) | |
parent | 7a4a77b7771164d61ce702a588067d1e1d66db7c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/iface.c
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7bba49d2b6ca..140da4a7f13d 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1511,7 +1511,7 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, | |||
1511 | return; | 1511 | return; |
1512 | } | 1512 | } |
1513 | 1513 | ||
1514 | ieee80211_select_queue(local, skb); | 1514 | ieee80211_set_qos_hdr(local, skb); |
1515 | ieee80211_tx(sdata, skb, false); | 1515 | ieee80211_tx(sdata, skb, false); |
1516 | rcu_read_unlock(); | 1516 | rcu_read_unlock(); |
1517 | } | 1517 | } |
@@ -2289,6 +2289,9 @@ void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) | |||
2289 | skb_set_network_header(skb, 0); | 2289 | skb_set_network_header(skb, 0); |
2290 | skb_set_transport_header(skb, 0); | 2290 | skb_set_transport_header(skb, 0); |
2291 | 2291 | ||
2292 | /* send all internal mgmt frames on VO */ | ||
2293 | skb_set_queue_mapping(skb, 0); | ||
2294 | |||
2292 | /* | 2295 | /* |
2293 | * The other path calling ieee80211_xmit is from the tasklet, | 2296 | * The other path calling ieee80211_xmit is from the tasklet, |
2294 | * and while we can handle concurrent transmissions locking | 2297 | * and while we can handle concurrent transmissions locking |