Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 075d8a75 authored by Liad Kaufman's avatar Liad Kaufman Committed by Luca Coelho
Browse files

iwlwifi: fix long debug print 



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: 92b0f7b2 ("iwlwifi: split the regulatory rules when the bandwidth flags require it")
Signed-off-by: default avatarLiad Kaufman <liad.kaufman@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent d081a16d

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -915,7 +915,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, 
		prev_reg_rule_flags = reg_rule_flags;

		prev_reg_rule_flags = reg_rule_flags;





		IWL_DEBUG_DEV(dev, IWL_DL_LAR,

		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,

			      center_freq,

			      band == NL80211_BAND_5GHZ ? "5.2" : "2.4",

			      band == NL80211_BAND_5GHZ ? "5.2" : "2.4",

			      CHECK_AND_PRINT_I(VALID),

			      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(80MHZ),

			      CHECK_AND_PRINT_I(160MHZ),

			      CHECK_AND_PRINT_I(160MHZ),

			      CHECK_AND_PRINT_I(DC_HIGH),

			      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_ACTIVE) &&

			       !(ch_flags & NVM_CHANNEL_RADAR))

			       !(ch_flags & NVM_CHANNEL_RADAR))

					 ? "Ad-Hoc" : "");

					 ? "Ad-Hoc" : "");