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/rx.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/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index bfcf09eb64b..e12f39a9646 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1665,7 +1665,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) memset(info, 0, sizeof(*info)); info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; info->control.vif = &rx->sdata->vif; - ieee80211_select_queue(local, fwd_skb); + skb_set_queue_mapping(skb, + ieee80211_select_queue(rx->sdata, fwd_skb)); + ieee80211_set_qos_hdr(local, skb); if (is_multicast_ether_addr(fwd_hdr->addr1)) IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh, fwded_mcast); |