diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-29 11:00:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-29 11:00:58 -0400 |
| commit | 2ae7a39770c734efb04daef6ffca233101ed7c22 (patch) | |
| tree | 046db19097aab564e052bb5e093f8176e0072cd1 /net/wireless/reg.c | |
| parent | 21f1b8a6636c4dbde4aa1ec0343f42eaf653ffcc (diff) | |
| parent | 517879147493a5e1df6b89a50f708f1133fcaddb (diff) | |
| download | linux-2ae7a39770c734efb04daef6ffca233101ed7c22.tar.bz2 | |
Merge tag 'mac80211-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
* fix use-after-free in mac80211 TXQs
* fix RX STBC byte order
* fix debugfs rename crashing due to ERR_PTR()
* fix missing regulatory notification
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 0ba778f371cb..a6fd5ce199da 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -3778,10 +3778,9 @@ void wiphy_regulatory_register(struct wiphy *wiphy) /* * The last request may have been received before this * registration call. Call the driver notifier if - * initiator is USER and user type is CELL_BASE. + * initiator is USER. */ - if (lr->initiator == NL80211_REGDOM_SET_BY_USER && - lr->user_reg_hint_type == NL80211_USER_REG_HINT_CELL_BASE) + if (lr->initiator == NL80211_REGDOM_SET_BY_USER) reg_call_notifier(wiphy, lr); } |