diff options
| author | Javier Cardona <javier@cozybit.com> | 2011-09-07 17:49:52 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-14 13:56:48 -0400 |
| commit | 4777be41638cfab56c78b2a764a5f83beb6cfdd2 (patch) | |
| tree | 9b041c2ffdaccf13a24b8bdb62c817cc87942a01 /net/mac80211/wme.c | |
| parent | 3de3d966007592693e68a973f62a1e3828565af0 (diff) | |
| download | lwn-4777be41638cfab56c78b2a764a5f83beb6cfdd2.tar.gz lwn-4777be41638cfab56c78b2a764a5f83beb6cfdd2.zip | |
mac80211: Start implementing QoS support for mesh interfaces
In order to support QoS in mesh, we need to assign queue mapping only
after the next hop has been resolved, both for forwarded and locally
originated frames. Also, now that this is fixed, remove the XXX comment
in ieee80211_select_queue().
Also, V-Shy Ho reported that the queue mapping was not being applied to
the forwarded frame (fwd_skb instead of skb). Fixed that as well.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wme.c')
| -rw-r--r-- | net/mac80211/wme.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 7a49532f14cb..a9fee2bc6300 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c @@ -83,11 +83,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, break; #ifdef CONFIG_MAC80211_MESH case NL80211_IFTYPE_MESH_POINT: - /* - * XXX: This is clearly broken ... but already was before, - * because ieee80211_fill_mesh_addresses() would clear A1 - * except for multicast addresses. - */ + ra = skb->data; break; #endif case NL80211_IFTYPE_STATION: |