diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-18 15:33:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-18 15:33:49 -0500 |
| commit | 86c8fc4bbe14b8950e62d379bb57722427ad3d67 (patch) | |
| tree | 4bb37ed1a108d2025150f716ca1c2cadadb6153d /net/mac80211/mlme.c | |
| parent | 7dce675b28bcd7f9daf3eef896ec2757255e2623 (diff) | |
| parent | 28a9bc68124c319b2b3dc861e80828a8865fd1ba (diff) | |
| download | linux-86c8fc4bbe14b8950e62d379bb57722427ad3d67.tar.bz2 | |
Merge tag 'mac80211-for-davem-2014-12-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
pull-request: mac80211 2014-12-18
Also from me a first pull request - we have a number of really old
issues that happened to crop up now with new work (or just more testing)
in the right areas as well as some small bugs newly introduced in 3.19.
Let me know if there are any problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
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 75a9bf50207e..2c36c4765f47 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -174,6 +174,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; } |