diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-17 14:43:17 -0500 |
| commit | 7916a075571f0ccd0830cf3da293188a8b6045e3 (patch) | |
| tree | 119c5bb9e513c8205efed485c2dc7b8271123326 /net/wireless/reg.c | |
| parent | cf84eb0b09c0f09b4c70a648b9dfeec78be61f07 (diff) | |
| parent | e4e19c031901e95dc7d1cf0a2c9c50525d71651f (diff) | |
| download | linux-rt-7916a075571f0ccd0830cf3da293188a8b6045e3.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 7d20d844ca60..9b897fca7487 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1853,6 +1853,8 @@ int regulatory_hint(struct wiphy *wiphy, const char *alpha2) if (WARN_ON(!alpha2 || !wiphy)) return -EINVAL; + wiphy->regulatory_flags &= ~REGULATORY_CUSTOM_REG; + request = kzalloc(sizeof(struct regulatory_request), GFP_KERNEL); if (!request) return -ENOMEM; |