diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c index 392d96df0b6c..16e656a311a7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd-check.c | |||
@@ -51,53 +51,53 @@ int iwl_agn_check_rxon_cmd(struct iwl_priv *priv) | |||
51 | (RXON_FLG_TGJ_NARROW_BAND_MSK | | 51 | (RXON_FLG_TGJ_NARROW_BAND_MSK | |
52 | RXON_FLG_RADAR_DETECT_MSK)); | 52 | RXON_FLG_RADAR_DETECT_MSK)); |
53 | if (error) | 53 | if (error) |
54 | IWL_WARNING("check 24G fields %d | %d\n", | 54 | IWL_WARN(priv, "check 24G fields %d | %d\n", |
55 | counter++, error); | 55 | counter++, error); |
56 | } else { | 56 | } else { |
57 | error |= (rxon->flags & RXON_FLG_SHORT_SLOT_MSK) ? | 57 | error |= (rxon->flags & RXON_FLG_SHORT_SLOT_MSK) ? |
58 | 0 : le32_to_cpu(RXON_FLG_SHORT_SLOT_MSK); | 58 | 0 : le32_to_cpu(RXON_FLG_SHORT_SLOT_MSK); |
59 | if (error) | 59 | if (error) |
60 | IWL_WARNING("check 52 fields %d | %d\n", | 60 | IWL_WARN(priv, "check 52 fields %d | %d\n", |
61 | counter++, error); | 61 | counter++, error); |
62 | error |= le32_to_cpu(rxon->flags & RXON_FLG_CCK_MSK); | 62 | error |= le32_to_cpu(rxon->flags & RXON_FLG_CCK_MSK); |
63 | if (error) | 63 | if (error) |
64 | IWL_WARNING("check 52 CCK %d | %d\n", | 64 | IWL_WARN(priv, "check 52 CCK %d | %d\n", |
65 | counter++, error); | 65 | counter++, error); |
66 | } | 66 | } |
67 | error |= (rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1; | 67 | error |= (rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1; |
68 | if (error) | 68 | if (error) |
69 | IWL_WARNING("check mac addr %d | %d\n", counter++, error); | 69 | IWL_WARN(priv, "check mac addr %d | %d\n", counter++, error); |
70 | 70 | ||
71 | /* make sure basic rates 6Mbps and 1Mbps are supported */ | 71 | /* make sure basic rates 6Mbps and 1Mbps are supported */ |
72 | error |= (((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0) && | 72 | error |= (((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0) && |
73 | ((rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0)); | 73 | ((rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0)); |
74 | if (error) | 74 | if (error) |
75 | IWL_WARNING("check basic rate %d | %d\n", counter++, error); | 75 | IWL_WARN(priv, "check basic rate %d | %d\n", counter++, error); |
76 | 76 | ||
77 | error |= (le16_to_cpu(rxon->assoc_id) > 2007); | 77 | error |= (le16_to_cpu(rxon->assoc_id) > 2007); |
78 | if (error) | 78 | if (error) |
79 | IWL_WARNING("check assoc id %d | %d\n", counter++, error); | 79 | IWL_WARN(priv, "check assoc id %d | %d\n", counter++, error); |
80 | 80 | ||
81 | error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) | 81 | error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) |
82 | == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)); | 82 | == (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)); |
83 | if (error) | 83 | if (error) |
84 | IWL_WARNING("check CCK and short slot %d | %d\n", | 84 | IWL_WARN(priv, "check CCK and short slot %d | %d\n", |
85 | counter++, error); | 85 | counter++, error); |
86 | 86 | ||
87 | error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) | 87 | error |= ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) |
88 | == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)); | 88 | == (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)); |
89 | if (error) | 89 | if (error) |
90 | IWL_WARNING("check CCK & auto detect %d | %d\n", | 90 | IWL_WARN(priv, "check CCK & auto detect %d | %d\n", |
91 | counter++, error); | 91 | counter++, error); |
92 | 92 | ||
93 | error |= ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK | | 93 | error |= ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK | |
94 | RXON_FLG_TGG_PROTECT_MSK)) == RXON_FLG_TGG_PROTECT_MSK); | 94 | RXON_FLG_TGG_PROTECT_MSK)) == RXON_FLG_TGG_PROTECT_MSK); |
95 | if (error) | 95 | if (error) |
96 | IWL_WARNING("check TGG and auto detect %d | %d\n", | 96 | IWL_WARN(priv, "check TGG and auto detect %d | %d\n", |
97 | counter++, error); | 97 | counter++, error); |
98 | 98 | ||
99 | if (error) | 99 | if (error) |
100 | IWL_WARNING("Tuning to channel %d\n", | 100 | IWL_WARN(priv, "Tuning to channel %d\n", |
101 | le16_to_cpu(rxon->channel)); | 101 | le16_to_cpu(rxon->channel)); |
102 | 102 | ||
103 | if (error) { | 103 | if (error) { |