diff options
author | Javier Cardona <javier@cozybit.com> | 2009-07-07 13:55:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:31 -0400 |
commit | 249b405cf8145da8a74b70544ae1079d244bdb00 (patch) | |
tree | be2d79554f8a00ec74038e8526ceb1ce7a8daf3e /net/mac80211/tx.c | |
parent | 3d34deb6737b1ae1f8b7817b57d603807f5d88ea (diff) |
mac80211: Fix regression in mesh forwarding path.
The removal of the master netdev broke the mesh forwarding path. This patch
fixes it by using the new internal 'pending' queue.
As a result of this change, mesh forwarding no longer does the inefficient
802.11 -> 802.3 -> 802.11 conversion that was done before.
[Changes since v1]
Suggested by Johannes:
- Select queue before adding to mpath queue
- ieee80211_add_pending_skb -> ieee80211_add_pending_skbs
- Remove unnecessary header wme.h
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Andrey Yurovsky <andrey@cozybit.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index a204092e8356..2572509d5568 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1419,9 +1419,6 @@ static void ieee80211_xmit(struct ieee80211_sub_if_data *sdata, | |||
1419 | dev_put(sdata->dev); | 1419 | dev_put(sdata->dev); |
1420 | return; | 1420 | return; |
1421 | } | 1421 | } |
1422 | if (memcmp(sdata->dev->dev_addr, hdr->addr4, ETH_ALEN) != 0) | ||
1423 | IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh, | ||
1424 | fwded_frames); | ||
1425 | } else if (unlikely(sdata->vif.type == NL80211_IFTYPE_MONITOR)) { | 1422 | } else if (unlikely(sdata->vif.type == NL80211_IFTYPE_MONITOR)) { |
1426 | int hdrlen; | 1423 | int hdrlen; |
1427 | u16 len_rthdr; | 1424 | u16 len_rthdr; |