Merge tag 'mac80211-next-for-john-2014-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg <johannes@sipsolutions.net> says:

"Not that much content this time. Some RCU cleanups, crypto
performance improvements, and various patches all over,
rather than listing them one might as well look into the
git log instead."

Signed-off-by: John W. Linville <linville@tuxdriver.com>

Conflicts:
	drivers/net/wireless/ath/wil6210/wmi.c

2 files changed, 12 insertions, 37 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index e535807c3d89..ba60e37213eb 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -717,6 +717,7 @@ ath6kl_add_bss_if_needed(struct ath6kl_vif *vif,
                 memcpy(ie + 2, vif->ssid, vif->ssid_len);
                 memcpy(ie + 2 + vif->ssid_len, beacon_ie, beacon_ie_len);
                 bss = cfg80211_inform_bss(ar->wiphy, chan,
+                                          CFG80211_BSS_FTYPE_UNKNOWN,
                                           bssid, 0, cap_val, 100,
                                           ie, 2 + vif->ssid_len + beacon_ie_len,
                                           0, GFP_KERNEL);
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 94df345d08c2..b921005ad7ee 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -619,8 +619,7 @@ static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi *wmi, u8 *datap, int len,
                    dlen, freq, vif->probe_req_report);
 
         if (vif->probe_req_report || vif->nw_type == AP_NETWORK)
-                cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0,
-                                 GFP_ATOMIC);
+                cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0);
 
         return 0;
 }
@@ -659,7 +658,7 @@ static int ath6kl_wmi_rx_action_event_rx(struct wmi *wmi, u8 *datap, int len,
                 return -EINVAL;
         }
         ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);
-        cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0, GFP_ATOMIC);
+        cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0);
 
         return 0;
 }
@@ -1093,7 +1092,6 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len,
         u8 *buf;
         struct ieee80211_channel *channel;
         struct ath6kl *ar = wmi->parent_dev;
-        struct ieee80211_mgmt *mgmt;
         struct cfg80211_bss *bss;
 
         if (len <= sizeof(struct wmi_bss_info_hdr2))
@@ -1139,39 +1137,15 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len,
                 }
         }
 
-        /*
-         * In theory, use of cfg80211_inform_bss() would be more natural here
-         * since we do not have the full frame. However, at least for now,
-         * cfg80211 can only distinguish Beacon and Probe Response frames from
-         * each other when using cfg80211_inform_bss_frame(), so let's build a
-         * fake IEEE 802.11 header to be able to take benefit of this.
-         */
-        mgmt = kmalloc(24 + len, GFP_ATOMIC);
-        if (mgmt == NULL)
-                return -EINVAL;
-
-        if (bih->frame_type == BEACON_FTYPE) {
-                mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                                  IEEE80211_STYPE_BEACON);
-                memset(mgmt->da, 0xff, ETH_ALEN);
-        } else {
-                struct net_device *dev = vif->ndev;
-
-                mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
-                                                  IEEE80211_STYPE_PROBE_RESP);
-                memcpy(mgmt->da, dev->dev_addr, ETH_ALEN);
-        }
-        mgmt->duration = cpu_to_le16(0);
-        memcpy(mgmt->sa, bih->bssid, ETH_ALEN);
-        memcpy(mgmt->bssid, bih->bssid, ETH_ALEN);
-        mgmt->seq_ctrl = cpu_to_le16(0);
-
-        memcpy(&mgmt->u.beacon, buf, len);
-
-        bss = cfg80211_inform_bss_frame(ar->wiphy, channel, mgmt,
-                                        24 + len, (bih->snr - 95) * 100,
-                                        GFP_ATOMIC);
-        kfree(mgmt);
+        bss = cfg80211_inform_bss(ar->wiphy, channel,
+                                  bih->frame_type == BEACON_FTYPE ?
+                                        CFG80211_BSS_FTYPE_BEACON :
+                                        CFG80211_BSS_FTYPE_PRESP,
+                                  bih->bssid, get_unaligned_le64((__le64 *)buf),
+                                  get_unaligned_le16(((__le16 *)buf) + 5),
+                                  get_unaligned_le16(((__le16 *)buf) + 4),
+                                  buf + 8 + 2 + 2, len - 8 - 2 - 2,
+                                  (bih->snr - 95) * 100, GFP_ATOMIC);
         if (bss == NULL)
                 return -ENOMEM;
         cfg80211_put_bss(ar->wiphy, bss);