Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / drivers / net / wireless / ath / ath10k / wmi.c

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 2b78ed89e1b69c98f89c4d78271250da731ed580..cd438f76f284bdeb0d1be6c9f9421d1af37eed40 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2611,36 +2611,9 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
                ath10k_mac_handle_beacon(ar, skb);
 
        if (ieee80211_is_beacon(hdr->frame_control) ||
-           ieee80211_is_probe_resp(hdr->frame_control)) {
-               struct ieee80211_mgmt *mgmt = (void *)skb->data;
-               enum cfg80211_bss_frame_type ftype;
-               u8 *ies;
-               int ies_ch;
-
+           ieee80211_is_probe_resp(hdr->frame_control))
                status->boottime_ns = ktime_get_boottime_ns();
 
-               if (!ar->scan_channel)
-                       goto drop;
-
-               ies = mgmt->u.beacon.variable;
-
-               if (ieee80211_is_beacon(mgmt->frame_control))
-                       ftype = CFG80211_BSS_FTYPE_BEACON;
-               else
-                       ftype = CFG80211_BSS_FTYPE_PRESP;
-
-               ies_ch = cfg80211_get_ies_channel_number(mgmt->u.beacon.variable,
-                                                        skb_tail_pointer(skb) - ies,
-                                                        sband->band, ftype);
-
-               if (ies_ch > 0 && ies_ch != channel) {
-                       ath10k_dbg(ar, ATH10K_DBG_MGMT,
-                                  "channel mismatched ds channel %d scan channel %d\n",
-                                  ies_ch, channel);
-                       goto drop;
-               }
-       }
-
        ath10k_dbg(ar, ATH10K_DBG_MGMT,
                   "event mgmt rx skb %pK len %d ftype %02x stype %02x\n",
                   skb, skb->len,
@@ -2654,10 +2627,6 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
        ieee80211_rx_ni(ar->hw, skb);
 
        return 0;
-
-drop:
-       dev_kfree_skb(skb);
-       return 0;
 }
 
 static int freq_to_idx(struct ath10k *ar, int freq)