mac80211: fix forwarded mesh frame queue mapping

We can't rely on ieee80211_select_queue() to do its job at this point
since the skb->protocol is not yet known. Instead, factor out and reuse
the queue mapping logic for injected frames.

Also, to mitigate congestion, forwarded frames should be dropped if the
outgoing queue was stopped.  This was not correctly implemented as we
were not checking the right queue.  Furthermore, we were dropping frames
that had arrived to their destination if that queue was stopped.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 14 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index be1d61e76e93..3d3bb5e9d8fa 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -672,7 +672,6 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_hdr *hdr;
         struct ieee80211_radiotap_header *rtap = (void *)skb->data;
-        u8 *p;
 
         if (local->hw.queues < 4)
                 return 0;
@@ -683,19 +682,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
 
         hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
 
-        if (!ieee80211_is_data(hdr->frame_control)) {
-                skb->priority = 7;
-                return ieee802_1d_to_ac[skb->priority];
-        }
-        if (!ieee80211_is_data_qos(hdr->frame_control)) {
-                skb->priority = 0;
-                return ieee802_1d_to_ac[skb->priority];
-        }
-
-        p = ieee80211_get_qos_ctl(hdr);
-        skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
-
-        return ieee80211_downgrade_queue(local, skb);
+        return ieee80211_select_queue_80211(local, skb, hdr);
 }
 
 static const struct net_device_ops ieee80211_monitorif_ops = {