Merge tag 'mac80211-next-for-davem-2016-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Here's another round of updates for -next:
 * big A-MSDU RX performance improvement (avoid linearize of paged RX)
 * rfkill changes: cleanups, documentation, platform properties
 * basic PBSS support in cfg80211
 * MU-MIMO action frame processing support
 * BlockAck reordering & duplicate detection offload support
 * various cleanups & little fixes
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 19 insertions, 13 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 978d3bc31df7..fc3238376b39 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -7,6 +7,7 @@
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2009, Johannes Berg <johannes@sipsolutions.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
+ * Copyright(c) 2016 Intel Deutschland GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -1050,9 +1051,8 @@ static void ieee80211_update_sta_info(struct ieee80211_sub_if_data *sdata,
                 struct cfg80211_chan_def chandef;
                 enum ieee80211_sta_rx_bandwidth bw = sta->sta.bandwidth;
 
-                ieee80211_ht_oper_to_chandef(channel,
-                                             elems->ht_operation,
-                                             &chandef);
+                cfg80211_chandef_create(&chandef, channel, NL80211_CHAN_NO_HT);
+                ieee80211_chandef_ht_oper(elems->ht_operation, &chandef);
 
                 memcpy(&htcap_ie, elems->ht_cap_elem, sizeof(htcap_ie));
                 rates_updated |= ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
@@ -1066,9 +1066,8 @@ static void ieee80211_update_sta_info(struct ieee80211_sub_if_data *sdata,
                         struct ieee80211_vht_cap cap_ie;
                         struct ieee80211_sta_vht_cap cap = sta->sta.vht_cap;
 
-                        ieee80211_vht_oper_to_chandef(channel,
-                                                      elems->vht_operation,
-                                                      &chandef);
+                        ieee80211_chandef_vht_oper(elems->vht_operation,
+                                                   &chandef);
                         memcpy(&cap_ie, elems->vht_cap_elem, sizeof(cap_ie));
                         ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband,
                                                             &cap_ie, sta);
@@ -1485,14 +1484,21 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
 
                 sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
 
-                num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy,
-                                                         &ifibss->chandef,
-                                                         channels,
-                                                         ARRAY_SIZE(channels));
                 scan_width = cfg80211_chandef_to_scan_width(&ifibss->chandef);
-                ieee80211_request_ibss_scan(sdata, ifibss->ssid,
-                                            ifibss->ssid_len, channels, num,
-                                            scan_width);
+
+                if (ifibss->fixed_channel) {
+                        num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy,
+                                                                 &ifibss->chandef,
+                                                                 channels,
+                                                                 ARRAY_SIZE(channels));
+                        ieee80211_request_ibss_scan(sdata, ifibss->ssid,
+                                                    ifibss->ssid_len, channels,
+                                                    num, scan_width);
+                } else {
+                        ieee80211_request_ibss_scan(sdata, ifibss->ssid,
+                                                    ifibss->ssid_len, NULL,
+                                                    0, scan_width);
+                }
         } else {
                 int interval = IEEE80211_SCAN_INTERVAL;