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 /drivers/net/wireless/ath/ath6kl/cfg80211.c | |
| parent | 0ef9059d4117e92f35525ce260b1f8eca2b569fa (diff) | |
| parent | bbf67e450a5dc2a595e1e7a67b4869f1a7f5a338 (diff) | |
| download | op-kernel-dev-028f43bc64401ead2bf86adcef1b7ffdbb170509.zip op-kernel-dev-028f43bc64401ead2bf86adcef1b7ffdbb170509.tar.gz | |
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 'drivers/net/wireless/ath/ath6kl/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index aae65ce..0c118b7c 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -1503,7 +1503,6 @@ static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy, const char *name, unsigned char name_assign_type, enum nl80211_iftype type, - u32 *flags, struct vif_params *params) { struct ath6kl *ar = wiphy_priv(wiphy); @@ -1550,7 +1549,7 @@ static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy, static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, - enum nl80211_iftype type, u32 *flags, + enum nl80211_iftype type, struct vif_params *params) { struct ath6kl_vif *vif = netdev_priv(ndev); |
