Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

4 files changed, 20 insertions, 10 deletions

diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 799a9208c4b4..095be91829ca 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -271,9 +271,11 @@ static void add_files(struct ieee80211_sub_if_data *sdata)
         }
 }
 
-#define DEBUGFS_DEL(name, type)\
-        debugfs_remove(sdata->debugfs.type.name);\
-        sdata->debugfs.type.name = NULL;
+#define DEBUGFS_DEL(name, type)                                 \
+        do {                                                    \
+                debugfs_remove(sdata->debugfs.type.name);       \
+                sdata->debugfs.type.name = NULL;                \
+        } while (0)
 
 static void del_sta_files(struct ieee80211_sub_if_data *sdata)
 {
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index d41e696f3980..da34ea70276f 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -157,7 +157,7 @@ static ssize_t sta_last_seq_ctrl_read(struct file *file, char __user *userbuf,
         struct sta_info *sta = file->private_data;
         for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
                 p += scnprintf(p, sizeof(buf)+buf-p, "%x ",
-                               sta->last_seq_ctrl[i]);
+                               le16_to_cpu(sta->last_seq_ctrl[i]));
         p += scnprintf(p, sizeof(buf)+buf-p, "\n");
         return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
 }
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index c944b17d0fc0..8ec5ed192b5d 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -1650,6 +1650,7 @@ static int ieee80211_master_start_xmit(struct sk_buff *skb,
         if (skb_headroom(skb) < headroom) {
                 if (pskb_expand_head(skb, headroom, 0, GFP_ATOMIC)) {
                         dev_kfree_skb(skb);
+                        dev_put(odev);
                         return 0;
                 }
         }
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index d0e1ab5589db..e7904db55325 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -697,17 +697,24 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev,
         if (!netif_running(dev))
                 return -ENETDOWN;
 
-        if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
-                if (sdata->type == IEEE80211_IF_TYPE_STA ||
-                    sdata->type == IEEE80211_IF_TYPE_IBSS) {
+        switch (sdata->type) {
+        case IEEE80211_IF_TYPE_STA:
+        case IEEE80211_IF_TYPE_IBSS:
+                if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
                         ssid = sdata->u.sta.ssid;
                         ssid_len = sdata->u.sta.ssid_len;
-                } else if (sdata->type == IEEE80211_IF_TYPE_AP) {
+                }
+                break;
+        case IEEE80211_IF_TYPE_AP:
+                if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
                         ssid = sdata->u.ap.ssid;
                         ssid_len = sdata->u.ap.ssid_len;
-                } else
-                        return -EINVAL;
+                }
+                break;
+        default:
+                return -EOPNOTSUPP;
         }
+
         return ieee80211_sta_req_scan(dev, ssid, ssid_len);
 }