hwmon: (adt7473) Fix voltage conversion routines

[linux-2.6-omap-h63xx.git] / net / mac80211 / wme.c

diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 4310e2f65661e8a663c519eded289d263d46f613..139b5f267b34b4e38d2925996936ab7f389061a9 100644 (file)
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -39,7 +39,7 @@ static unsigned int classify_1d(struct sk_buff *skb)
                return skb->priority - 256;
 
        switch (skb->protocol) {
-       case __constant_htons(ETH_P_IP):
+       case htons(ETH_P_IP):
                dscp = ip_hdr(skb)->tos & 0xfc;
                break;
 
@@ -47,8 +47,6 @@ static unsigned int classify_1d(struct sk_buff *skb)
                return 0;
        }
 
-       if (dscp & 0x1c)
-               return 0;
        return dscp >> 5;
 }
 
@@ -75,9 +73,8 @@ static int wme_downgrade_ac(struct sk_buff *skb)
 
 
 /* Indicate which queue to use.  */
-static u16 classify80211(struct sk_buff *skb, struct net_device *dev)
+static u16 classify80211(struct ieee80211_local *local, struct sk_buff *skb)
 {
-       struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
 
        if (!ieee80211_is_data(hdr->frame_control)) {
@@ -115,14 +112,15 @@ static u16 classify80211(struct sk_buff *skb, struct net_device *dev)
 
 u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb)
 {
+       struct ieee80211_master_priv *mpriv = netdev_priv(dev);
+       struct ieee80211_local *local = mpriv->local;
        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-       struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct sta_info *sta;
        u16 queue;
        u8 tid;
 
-       queue = classify80211(skb, dev);
+       queue = classify80211(local, skb);
        if (unlikely(queue >= local->hw.queues))
                queue = local->hw.queues - 1;
 
@@ -212,7 +210,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
                                DECLARE_MAC_BUF(mac);
                                printk(KERN_DEBUG "allocated aggregation queue"
                                        " %d tid %d addr %s pool=0x%lX\n",
-                                       i, tid, print_mac(mac, sta->addr),
+                                       i, tid, print_mac(mac, sta->sta.addr),
                                        local->queue_pool[0]);
                        }
 #endif /* CONFIG_MAC80211_HT_DEBUG */