diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 07:09:01 -0500 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 07:09:01 -0500 |
commit | a6766ccdaf9cc80d565672516d429a562d1a732d (patch) | |
tree | d9a98acc6eef19ef41a7ef053117ba7df1c53324 /drivers/net/wireless/iwlegacy/4965.c | |
parent | 6bbb1370c3083190cae8487c2c61c0d24f869e68 (diff) |
iwlegacy: s/STATUS_/S_/
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/4965.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/iwlegacy/4965.c index 8199e635d537..1efe824963a8 100644 --- a/drivers/net/wireless/iwlegacy/4965.c +++ b/drivers/net/wireless/iwlegacy/4965.c | |||
@@ -1349,7 +1349,7 @@ static int il4965_send_tx_power(struct il_priv *il) | |||
1349 | u8 ctrl_chan_high = 0; | 1349 | u8 ctrl_chan_high = 0; |
1350 | struct il_rxon_context *ctx = &il->ctx; | 1350 | struct il_rxon_context *ctx = &il->ctx; |
1351 | 1351 | ||
1352 | if (WARN_ONCE(test_bit(STATUS_SCAN_HW, &il->status), | 1352 | if (WARN_ONCE(test_bit(S_SCAN_HW, &il->status), |
1353 | "TX Power requested while scanning!\n")) | 1353 | "TX Power requested while scanning!\n")) |
1354 | return -EAGAIN; | 1354 | return -EAGAIN; |
1355 | 1355 | ||
@@ -1441,7 +1441,7 @@ static int il4965_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) | |||
1441 | * receive commit_rxon request | 1441 | * receive commit_rxon request |
1442 | * abort any previous channel switch if still in process | 1442 | * abort any previous channel switch if still in process |
1443 | */ | 1443 | */ |
1444 | if (test_bit(STATUS_CHANNEL_SWITCH_PENDING, &il->status) && | 1444 | if (test_bit(S_CHANNEL_SWITCH_PENDING, &il->status) && |
1445 | il->switch_channel != ctx->staging.channel) { | 1445 | il->switch_channel != ctx->staging.channel) { |
1446 | D_11H("abort channel switch on %d\n", | 1446 | D_11H("abort channel switch on %d\n", |
1447 | le16_to_cpu(il->switch_channel)); | 1447 | le16_to_cpu(il->switch_channel)); |
@@ -1673,7 +1673,7 @@ static int il4965_hw_get_temperature(struct il_priv *il) | |||
1673 | s32 R1, R2, R3; | 1673 | s32 R1, R2, R3; |
1674 | u32 R4; | 1674 | u32 R4; |
1675 | 1675 | ||
1676 | if (test_bit(STATUS_TEMPERATURE, &il->status) && | 1676 | if (test_bit(S_TEMPERATURE, &il->status) && |
1677 | (il->_4965.stats.flag & | 1677 | (il->_4965.stats.flag & |
1678 | STATISTICS_REPLY_FLG_HT40_MODE_MSK)) { | 1678 | STATISTICS_REPLY_FLG_HT40_MODE_MSK)) { |
1679 | D_TEMP("Running HT40 temperature calibration\n"); | 1679 | D_TEMP("Running HT40 temperature calibration\n"); |
@@ -1696,7 +1696,7 @@ static int il4965_hw_get_temperature(struct il_priv *il) | |||
1696 | * with an updated temperature, use R4 provided to us in the | 1696 | * with an updated temperature, use R4 provided to us in the |
1697 | * "initialize" ALIVE response. | 1697 | * "initialize" ALIVE response. |
1698 | */ | 1698 | */ |
1699 | if (!test_bit(STATUS_TEMPERATURE, &il->status)) | 1699 | if (!test_bit(S_TEMPERATURE, &il->status)) |
1700 | vt = sign_extend32(R4, 23); | 1700 | vt = sign_extend32(R4, 23); |
1701 | else | 1701 | else |
1702 | vt = sign_extend32(le32_to_cpu(il->_4965.stats. | 1702 | vt = sign_extend32(le32_to_cpu(il->_4965.stats. |
@@ -1737,7 +1737,7 @@ static int il4965_is_temp_calib_needed(struct il_priv *il) | |||
1737 | { | 1737 | { |
1738 | int temp_diff; | 1738 | int temp_diff; |
1739 | 1739 | ||
1740 | if (!test_bit(STATUS_STATISTICS, &il->status)) { | 1740 | if (!test_bit(S_STATISTICS, &il->status)) { |
1741 | D_TEMP("Temperature not updated -- no stats.\n"); | 1741 | D_TEMP("Temperature not updated -- no stats.\n"); |
1742 | return 0; | 1742 | return 0; |
1743 | } | 1743 | } |
@@ -1784,10 +1784,10 @@ static void il4965_temperature_calib(struct il_priv *il) | |||
1784 | } | 1784 | } |
1785 | 1785 | ||
1786 | il->temperature = temp; | 1786 | il->temperature = temp; |
1787 | set_bit(STATUS_TEMPERATURE, &il->status); | 1787 | set_bit(S_TEMPERATURE, &il->status); |
1788 | 1788 | ||
1789 | if (!il->disable_tx_power_cal && | 1789 | if (!il->disable_tx_power_cal && |
1790 | unlikely(!test_bit(STATUS_SCANNING, &il->status)) && | 1790 | unlikely(!test_bit(S_SCANNING, &il->status)) && |
1791 | il4965_is_temp_calib_needed(il)) | 1791 | il4965_is_temp_calib_needed(il)) |
1792 | queue_work(il->workqueue, &il->txpower_work); | 1792 | queue_work(il->workqueue, &il->txpower_work); |
1793 | } | 1793 | } |
@@ -2179,7 +2179,7 @@ static void il4965_post_associate(struct il_priv *il) | |||
2179 | if (!vif || !il->is_open) | 2179 | if (!vif || !il->is_open) |
2180 | return; | 2180 | return; |
2181 | 2181 | ||
2182 | if (test_bit(STATUS_EXIT_PENDING, &il->status)) | 2182 | if (test_bit(S_EXIT_PENDING, &il->status)) |
2183 | return; | 2183 | return; |
2184 | 2184 | ||
2185 | il_scan_cancel_timeout(il, 200); | 2185 | il_scan_cancel_timeout(il, 200); |
@@ -2254,7 +2254,7 @@ static void il4965_config_ap(struct il_priv *il) | |||
2254 | 2254 | ||
2255 | lockdep_assert_held(&il->mutex); | 2255 | lockdep_assert_held(&il->mutex); |
2256 | 2256 | ||
2257 | if (test_bit(STATUS_EXIT_PENDING, &il->status)) | 2257 | if (test_bit(S_EXIT_PENDING, &il->status)) |
2258 | return; | 2258 | return; |
2259 | 2259 | ||
2260 | /* The following should be done only at AP bring up */ | 2260 | /* The following should be done only at AP bring up */ |