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

Commit a6477249 authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville
Browse files

iwlwifi: only check for association id when associating with AP 



There is no association process in IBSS mode - so testing the
association id is not needed.

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
CC: Richard Scherping <richard@scherping.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 58ff6d4d

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −1
Original line number Diff line number Diff line
@@ -2812,7 +2812,8 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, 
#endif



	/* drop all data frame if we are not associated */

	if ((!iwl3945_is_associated(priv) || !priv->assoc_id) &&

	if ((!iwl3945_is_associated(priv) ||

	     ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && !priv->assoc_id)) &&

	    ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA)) {

		IWL_DEBUG_DROP("Dropping - !iwl3945_is_associated\n");

		goto drop_unlock;

drivers/net/wireless/iwlwifi/iwl4965-base.c

+1 −1
Original line number Diff line number Diff line
@@ -2940,7 +2940,7 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv, 
	/* drop all data frame if we are not associated */

	if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&

	   (!iwl4965_is_associated(priv) ||

	    !priv->assoc_id ||

	    ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && !priv->assoc_id) ||

	    !priv->assoc_station_added)) {

		IWL_DEBUG_DROP("Dropping - !iwl4965_is_associated\n");

		goto drop_unlock;