]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iwlwifi: fix long debug print
authorLiad Kaufman <liad.kaufman@intel.com>
Sun, 20 Aug 2017 15:10:12 +0000 (18:10 +0300)
committerLuca Coelho <luciano.coelho@intel.com>
Wed, 30 Aug 2017 09:30:56 +0000 (12:30 +0300)
There is a debug print that sometimes reaches over
110 chars, thus generating a warning in those cases.
Split the print into two to prevent these cases.

Fixes: 92b0f7b26b31 ("iwlwifi: split the regulatory rules when the bandwidth flags require it")
Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

index b46796944cf2d7d2acca8a92787c5101e58f4ff7..3014beef48730dbd077c55b453e8e14c4bfb4c22 100644 (file)
@@ -915,7 +915,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
                prev_reg_rule_flags = reg_rule_flags;
 
                IWL_DEBUG_DEV(dev, IWL_DL_LAR,
-                             "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n",
+                             "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x)\n",
                              center_freq,
                              band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
                              CHECK_AND_PRINT_I(VALID),
@@ -930,7 +930,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
                              CHECK_AND_PRINT_I(80MHZ),
                              CHECK_AND_PRINT_I(160MHZ),
                              CHECK_AND_PRINT_I(DC_HIGH),
-                             ch_flags, reg_rule_flags,
+                             ch_flags);
+               IWL_DEBUG_DEV(dev, IWL_DL_LAR,
+                             "Ch. %d [%sGHz] reg_flags 0x%x: %s\n",
+                             center_freq,
+                             band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
+                             reg_rule_flags,
                              ((ch_flags & NVM_CHANNEL_ACTIVE) &&
                               !(ch_flags & NVM_CHANNEL_RADAR))
                                         ? "Ad-Hoc" : "");