diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-22 13:58:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-22 13:58:36 -0400 |
| commit | 40a10fd740a4d5a9f3da255cf8dae48c6723d1a6 (patch) | |
| tree | a65eb4adca8e37ed7335345e94e36918593f7f92 /net/mac80211/main.c | |
| parent | 99abe65ff18b6bbac2e55524827b571c3eccfa86 (diff) | |
| parent | 67af9811539be83dbdc0739215d29af23c870405 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 27b9364cdf17..d17c26d6e369 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
| @@ -956,6 +956,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) | |||
| 956 | if (local->hw.wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS) | 956 | if (local->hw.wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS) |
| 957 | local->hw.wiphy->flags |= WIPHY_FLAG_TDLS_EXTERNAL_SETUP; | 957 | local->hw.wiphy->flags |= WIPHY_FLAG_TDLS_EXTERNAL_SETUP; |
| 958 | 958 | ||
| 959 | local->hw.wiphy->max_num_csa_counters = IEEE80211_MAX_CSA_COUNTERS_NUM; | ||
| 960 | |||
| 959 | result = wiphy_register(local->hw.wiphy); | 961 | result = wiphy_register(local->hw.wiphy); |
| 960 | if (result < 0) | 962 | if (result < 0) |
| 961 | goto fail_wiphy_register; | 963 | goto fail_wiphy_register; |