Commit c37281a0 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwleagcy: fix ident code damage 



Using ident is not always good.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 774212b3

drivers/net/wireless/iwlegacy/3945-mac.c

+5 −13
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwlegacy/4965-mac.c

+5 −13
Original line number Diff line number Diff line
@@ -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);