Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

5 files changed, 17 insertions, 17 deletions

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 59f8adc2aa5f..d747da541747 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -278,13 +278,15 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
         int n_queues = sdata->local->hw.queues;
         int i;
 
-        for (i = 0; i < IEEE80211_NUM_ACS; i++) {
-                if (WARN_ON_ONCE(sdata->vif.hw_queue[i] ==
-                                 IEEE80211_INVAL_HW_QUEUE))
-                        return -EINVAL;
-                if (WARN_ON_ONCE(sdata->vif.hw_queue[i] >=
-                                 n_queues))
-                        return -EINVAL;
+        if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE) {
+                for (i = 0; i < IEEE80211_NUM_ACS; i++) {
+                        if (WARN_ON_ONCE(sdata->vif.hw_queue[i] ==
+                                         IEEE80211_INVAL_HW_QUEUE))
+                                return -EINVAL;
+                        if (WARN_ON_ONCE(sdata->vif.hw_queue[i] >=
+                                         n_queues))
+                                return -EINVAL;
+                }
         }
 
         if ((sdata->vif.type != NL80211_IFTYPE_AP) ||
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b382605c5733..61c621e9273f 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -103,7 +103,7 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local,
         return len;
 }
 
-/**
+/*
  * ieee80211_add_rx_radiotap_header - add radiotap header
  *
  * add a radiotap header containing all the fields which the hardware provided.
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 2303ee73b50a..c6e0d467f8bd 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1932,8 +1932,7 @@ static void restore_regulatory_settings(bool reset_user)
                         if (reg_request->initiator !=
                             NL80211_REGDOM_SET_BY_USER)
                                 continue;
-                        list_del(&reg_request->list);
-                        list_add_tail(&reg_request->list, &tmp_reg_req_list);
+                        list_move_tail(&reg_request->list, &tmp_reg_req_list);
                 }
         }
         spin_unlock(&reg_requests_lock);
@@ -1992,8 +1991,7 @@ static void restore_regulatory_settings(bool reset_user)
                               "into the queue\n",
                               reg_request->alpha2[0],
                               reg_request->alpha2[1]);
-                list_del(&reg_request->list);
-                list_add_tail(&reg_request->list, &reg_requests_list);
+                list_move_tail(&reg_request->list, &reg_requests_list);
         }
         spin_unlock(&reg_requests_lock);
 
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 848523a2b22f..9730c9862bdc 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -815,7 +815,7 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
                 return NULL;
 
         if (WARN_ON(wiphy->signal_type == CFG80211_SIGNAL_TYPE_UNSPEC &&
-                    (signal < 0 || signal > 100)))
+                    (signal < 0 || signal > 100)))
                 return NULL;
 
         if (WARN_ON(len < offsetof(struct ieee80211_mgmt, u.probe_resp.variable)))
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index b0eb7aa49b60..c8717c1d082e 100644
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -478,13 +478,13 @@ void wireless_send_event(struct net_device *	dev,
         if (descr->header_type == IW_HEADER_TYPE_POINT) {
                 /* Check if number of token fits within bounds */
                 if (wrqu->data.length > descr->max_tokens) {
-                        netdev_err(dev, "(WE) : Wireless Event too big (%d)\n",
-                                   wrqu->data.length);
+                        netdev_err(dev, "(WE) : Wireless Event (cmd=0x%04X) too big (%d)\n",
+                                   cmd, wrqu->data.length);
                         return;
                 }
                 if (wrqu->data.length < descr->min_tokens) {
-                        netdev_err(dev, "(WE) : Wireless Event too small (%d)\n",
-                                   wrqu->data.length);
+                        netdev_err(dev, "(WE) : Wireless Event (cmd=0x%04X) too small (%d)\n",
+                                   cmd, wrqu->data.length);
                         return;
                 }
                 /* Calculate extra_len - extra is NULL for restricted events */