diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-04-12 12:23:28 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-04-13 14:41:38 +0300 |
| commit | 818a986e4ebacea2020622e48c8bc04b7f500d89 (patch) | |
| tree | fd2c14201f014bf4f4598d61a98e0ae25a4be6f3 /net/wireless/util.c | |
| parent | 8c5e68894450d3bb7471e426e2eec9a8472bb660 (diff) | |
| download | linux-818a986e4ebacea2020622e48c8bc04b7f500d89.tar.xz | |
cfg80211: move add/change interface monitor flags into params
Instead passing both flags, which can be NULL, and vif_params,
which are never NULL, move the flags into the vif_params and
use BIT(0), which is invalid from userspace, to indicate that
the flags were changed.
While updating all drivers, fix a small bug in wil6210 where
it was setting the flags to 0 instead of leaving them unchanged.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 8d6a0a7b1ca1..88f3a11dbcd3 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -985,7 +985,7 @@ void cfg80211_process_rdev_events(struct cfg80211_registered_device *rdev) int cfg80211_change_iface(struct cfg80211_registered_device *rdev, struct net_device *dev, enum nl80211_iftype ntype, - u32 *flags, struct vif_params *params) + struct vif_params *params) { int err; enum nl80211_iftype otype = dev->ieee80211_ptr->iftype; @@ -1043,7 +1043,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, cfg80211_process_rdev_events(rdev); } - err = rdev_change_virtual_intf(rdev, dev, ntype, flags, params); + err = rdev_change_virtual_intf(rdev, dev, ntype, params); WARN_ON(!err && dev->ieee80211_ptr->iftype != ntype); |