diff options
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/channel.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/channel.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c index 4eb3f0d52105..cdb62b8ccc79 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c | |||
@@ -702,8 +702,8 @@ brcms_reg_apply_beaconing_flags(struct wiphy *wiphy, | |||
702 | } | 702 | } |
703 | } | 703 | } |
704 | 704 | ||
705 | static int brcms_reg_notifier(struct wiphy *wiphy, | 705 | static void brcms_reg_notifier(struct wiphy *wiphy, |
706 | struct regulatory_request *request) | 706 | struct regulatory_request *request) |
707 | { | 707 | { |
708 | struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); | 708 | struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); |
709 | struct brcms_info *wl = hw->priv; | 709 | struct brcms_info *wl = hw->priv; |
@@ -744,8 +744,6 @@ static int brcms_reg_notifier(struct wiphy *wiphy, | |||
744 | if (wlc->pub->_nbands > 1 || wlc->band->bandtype == BRCM_BAND_2G) | 744 | if (wlc->pub->_nbands > 1 || wlc->band->bandtype == BRCM_BAND_2G) |
745 | wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi, | 745 | wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi, |
746 | brcms_c_japan_ccode(request->alpha2)); | 746 | brcms_c_japan_ccode(request->alpha2)); |
747 | |||
748 | return 0; | ||
749 | } | 747 | } |
750 | 748 | ||
751 | void brcms_c_regd_init(struct brcms_c_info *wlc) | 749 | void brcms_c_regd_init(struct brcms_c_info *wlc) |