diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-20 13:54:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-20 13:54:40 -0400 |
| commit | 028f43bc64401ead2bf86adcef1b7ffdbb170509 (patch) | |
| tree | 7fff5ae2f854874aa86b9826d3bd8197326b102f /net/wireless/wext-compat.c | |
| parent | 0ef9059d4117e92f35525ce260b1f8eca2b569fa (diff) | |
| parent | bbf67e450a5dc2a595e1e7a67b4869f1a7f5a338 (diff) | |
| download | linux-stable-028f43bc64401ead2bf86adcef1b7ffdbb170509.tar.gz linux-stable-028f43bc64401ead2bf86adcef1b7ffdbb170509.tar.bz2 linux-stable-028f43bc64401ead2bf86adcef1b7ffdbb170509.zip | |
Merge tag 'mac80211-next-for-davem-2017-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
My last pull request has been a while, we now have:
* connection quality monitoring with multiple thresholds
* support for FILS shared key authentication offload
* pre-CAC regulatory compliance - only ETSI allows this
* sanity check for some rate confusion that hit ChromeOS
(but nobody else uses it, evidently)
* some documentation updates
* lots of cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/wext-compat.c')
| -rw-r--r-- | net/wireless/wext-compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index a220156cf217..5d4a02c7979b 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c @@ -62,7 +62,7 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info, memset(&vifparams, 0, sizeof(vifparams)); - return cfg80211_change_iface(rdev, dev, type, NULL, &vifparams); + return cfg80211_change_iface(rdev, dev, type, &vifparams); } EXPORT_WEXT_HANDLER(cfg80211_wext_siwmode); |