UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwleagcy: fix ident code damage 

Using ident is not always good.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stanislaw Gruszka 2012-02-13 11:23:23 +01:00 committed by John W. Linville
parent 774212b3f3
commit c37281a076
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/iwlegacy/3945-mac.c
View File

@ -2272,12 +2272,8 @@ __il3945_down(struct il_priv *il)
* clear all bits but the RF Kill bits and return */
if (!il_is_init(il)) {
il->status =
test_bit(S_RF_KILL_HW,
&il->
status) << S_RF_KILL_HW |
test_bit(S_GEO_CONFIGURED,
&il->
status) << S_GEO_CONFIGURED |
test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
goto exit;
}
@ -2285,13 +2281,9 @@ __il3945_down(struct il_priv *il)
/* ...otherwise clear out all the status bits but the RF Kill
* bit and continue taking the NIC down. */
il->status &=
test_bit(S_RF_KILL_HW,
&il->status) << S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED,
&il->
status) <<
S_GEO_CONFIGURED | test_bit(S_FW_ERROR,
&il->
status) << S_FW_ERROR |
test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR |
test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
il3945_hw_txq_ctx_stop(il);

18
drivers/net/wireless/iwlegacy/4965-mac.c
View File

@ -5384,12 +5384,8 @@ __il4965_down(struct il_priv *il)
* clear all bits but the RF Kill bit and return */
if (!il_is_init(il)) {
il->status =
test_bit(S_RF_KILL_HW,
&il->
status) << S_RF_KILL_HW |
test_bit(S_GEO_CONFIGURED,
&il->
status) << S_GEO_CONFIGURED |
test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
goto exit;
}
@ -5397,13 +5393,9 @@ __il4965_down(struct il_priv *il)
/* ...otherwise clear out all the status bits but the RF Kill
* bit and continue taking the NIC down. */
il->status &=
test_bit(S_RF_KILL_HW,
&il->status) << S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED,
&il->
status) <<
S_GEO_CONFIGURED | test_bit(S_FW_ERROR,
&il->
status) << S_FW_ERROR |
test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR |
test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
il4965_txq_ctx_stop(il);