KVM: PPC: Add dequeue for external on BookE

[safe/jmp/linux-2.6] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index fe140bf..e08fa8e 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -10,6 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
 #include <linux/netdevice.h>
@@ -684,20 +685,28 @@ 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;
 
        if (skb->len < 4 ||
-           skb->len < rtap->it_len + 2 /* frame control */)
+           skb->len < le16_to_cpu(rtap->it_len) + 2 /* frame control */)
                return 0; /* doesn't matter, frame will be dropped */
 
-       hdr = (void *)((u8 *)skb->data + rtap->it_len);
+       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);
 }
@@ -1023,7 +1032,7 @@ static int netdev_notify(struct notifier_block *nb,
 
        sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-       memcpy(sdata->name, sdata->name, IFNAMSIZ);
+       memcpy(sdata->name, dev->name, IFNAMSIZ);
 
        ieee80211_debugfs_rename_netdev(sdata);
        return 0;