diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/regd.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/regd.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/rtlwifi/regd.c b/drivers/net/wireless/rtlwifi/regd.c index 9fedb1f70919..c263df217604 100644 --- a/drivers/net/wireless/rtlwifi/regd.c +++ b/drivers/net/wireless/rtlwifi/regd.c | |||
@@ -398,13 +398,11 @@ int rtl_regd_init(struct ieee80211_hw *hw, | |||
398 | rtlpriv->regd.country_code = rtlpriv->efuse.channel_plan; | 398 | rtlpriv->regd.country_code = rtlpriv->efuse.channel_plan; |
399 | 399 | ||
400 | RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE, | 400 | RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE, |
401 | (KERN_DEBUG "rtl: EEPROM regdomain: 0x%0x\n", | 401 | "rtl: EEPROM regdomain: 0x%0x\n", rtlpriv->regd.country_code); |
402 | rtlpriv->regd.country_code)); | ||
403 | 402 | ||
404 | if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) { | 403 | if (rtlpriv->regd.country_code >= COUNTRY_CODE_MAX) { |
405 | RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG, | 404 | RT_TRACE(rtlpriv, COMP_REGD, DBG_DMESG, |
406 | (KERN_DEBUG "rtl: EEPROM indicates invalid contry code" | 405 | "rtl: EEPROM indicates invalid contry code, world wide 13 should be used\n"); |
407 | "world wide 13 should be used\n")); | ||
408 | 406 | ||
409 | rtlpriv->regd.country_code = COUNTRY_CODE_WORLD_WIDE_13; | 407 | rtlpriv->regd.country_code = COUNTRY_CODE_WORLD_WIDE_13; |
410 | } | 408 | } |
@@ -420,8 +418,8 @@ int rtl_regd_init(struct ieee80211_hw *hw, | |||
420 | } | 418 | } |
421 | 419 | ||
422 | RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE, | 420 | RT_TRACE(rtlpriv, COMP_REGD, DBG_TRACE, |
423 | (KERN_DEBUG "rtl: Country alpha2 being used: %c%c\n", | 421 | "rtl: Country alpha2 being used: %c%c\n", |
424 | rtlpriv->regd.alpha2[0], rtlpriv->regd.alpha2[1])); | 422 | rtlpriv->regd.alpha2[0], rtlpriv->regd.alpha2[1]); |
425 | 423 | ||
426 | _rtl_regd_init_wiphy(&rtlpriv->regd, wiphy, reg_notifier); | 424 | _rtl_regd_init_wiphy(&rtlpriv->regd, wiphy, reg_notifier); |
427 | 425 | ||
@@ -433,7 +431,7 @@ int rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) | |||
433 | struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); | 431 | struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); |
434 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 432 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
435 | 433 | ||
436 | RT_TRACE(rtlpriv, COMP_REGD, DBG_LOUD, ("\n")); | 434 | RT_TRACE(rtlpriv, COMP_REGD, DBG_LOUD, "\n"); |
437 | 435 | ||
438 | return _rtl_reg_notifier_apply(wiphy, request, &rtlpriv->regd); | 436 | return _rtl_reg_notifier_apply(wiphy, request, &rtlpriv->regd); |
439 | } | 437 | } |