On Thu, Oct 20, 2011 at 11:30 AM, Thomas Pedersen <thomas@xxxxxxxxxxx> wrote:
> Set proper queue mapping and timestamp for forwarded mesh frames.
>
> Thanks to Luis Rodriguez for investigating and fixing this.
>
> Signed-off-by: Thomas Pedersen <thomas@xxxxxxxxxxx>
>
> ---
> v2:
> We were already doing this for mcast frames, so don't duplicate
> the code.
>
> net/mac80211/rx.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
> index b867bd5..1408472 100644
> --- a/net/mac80211/rx.c
> +++ b/net/mac80211/rx.c
> @@ -1952,13 +1952,15 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
> info = IEEE80211_SKB_CB(fwd_skb);
> memset(info, 0, sizeof(*info));
> info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
> + info->control.jiffies = jiffies;
> info->control.vif = &rx->sdata->vif;
> + skb_set_queue_mapping(fwd_skb,
> + ieee80211_select_queue(sdata, fwd_skb));
> + ieee80211_set_qos_hdr(sdata, fwd_skb);
> +
> if (is_multicast_ether_addr(fwd_hdr->addr1)) {
> IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
> fwded_mcast);
> - skb_set_queue_mapping(fwd_skb,
> - ieee80211_select_queue(sdata, fwd_skb));
> - ieee80211_set_qos_hdr(sdata, fwd_skb);
> } else {
> int err;
> /*
> --
> 1.7.5.4
>
>
John,
It seems this patch reverts part of
4777be41638cfab56c78b2a764a5f83beb6cfdd2 "mac80211: Start implementing
QoS support for mesh interfaces", and is probably the cause for some
breakage we're seeing here. Please hold off on this patch until I can
figure out what the right thing to do is.
Thanks,
Thomas
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
