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

Commit 1353a7ba authored by Don Fry's avatar Don Fry Committed by John W. Linville
Browse files

iwlwifi: correct status bit refactoring errors 



I missed a couple of status bits in my refactoring changes.  This
fixes the ones I missed.

Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 97420515

drivers/net/wireless/iwlwifi/iwl-agn-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static int iwlagn_rx_card_state_notif(struct iwl_priv *priv, 
	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_card_state_notif *card_state_notif = (void *)pkt->data;

	u32 flags = le32_to_cpu(card_state_notif->flags);

	unsigned long status = priv->shrd->status;

	unsigned long status = priv->status;



	IWL_DEBUG_RF_KILL(priv, "Card state received: HW:%s SW:%s CT:%s\n",

			  (flags & HW_CARD_DISABLED) ? "Kill" : "On",

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −4
Original line number Diff line number Diff line
@@ -819,15 +819,15 @@ void iwl_down(struct iwl_priv *priv) 
	iwl_trans_stop_device(trans(priv));



	/* Clear out all status bits but a few that are stable across reset */

	priv->shrd->status &=

			test_bit(STATUS_RF_KILL_HW, &priv->status) <<

	priv->status &= test_bit(STATUS_RF_KILL_HW, &priv->status) <<

				STATUS_RF_KILL_HW |

			test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<

				STATUS_GEO_CONFIGURED |

			test_bit(STATUS_FW_ERROR, &priv->shrd->status) <<

				STATUS_FW_ERROR |

			test_bit(STATUS_EXIT_PENDING, &priv->status) <<

				STATUS_EXIT_PENDING;

	priv->shrd->status &=

			test_bit(STATUS_FW_ERROR, &priv->shrd->status) <<

				STATUS_FW_ERROR;



	dev_kfree_skb(priv->beacon_skb);

	priv->beacon_skb = NULL;