diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-01-07 14:39:02 +0100 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-07 14:39:16 +0100 |
commit | 3a4b0c948d286523ba062985c03487b55326eaae (patch) | |
tree | 8c61bbeb09f9d810d3132919c22e8effcc4e545c /net/mac80211/mlme.c | |
parent | fa44b988d2da58334ecbcf3e00f9acccbdeace6c (diff) | |
parent | 1e359a5de861a57aa04d92bb620f52a5c1d7f8b1 (diff) | |
download | op-kernel-dev-3a4b0c948d286523ba062985c03487b55326eaae.zip op-kernel-dev-3a4b0c948d286523ba062985c03487b55326eaae.tar.gz |
Merge branch 'mac80211' into mac80211-next
Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 38129dc..8354bed 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -178,6 +178,7 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, if (!(ht_cap->cap_info & cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40))) { ret = IEEE80211_STA_DISABLE_40MHZ; + vht_chandef = *chandef; goto out; } |