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

Commit 254aebf3 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlwifi: remove frame dropping 



With some of the new code in mac80211, public action
frames can be exchanged as non-injected frames even
while not associated.

Aside from that, dropping frames here is pointless
since we do deal with arbitrary frames that were
injected already, so let mac80211 make the decision
about which frames to allow or not.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent b4665df4

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

+0 −10
Original line number Diff line number Diff line
@@ -761,16 +761,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
		IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");

#endif



	/* drop all non-injected data frame if we are not associated */

	if (ieee80211_is_data(fc) &&

	    !(info->flags & IEEE80211_TX_CTL_INJECTED) &&

	    (!iwl_is_associated(priv) ||

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

	     !priv->assoc_station_added)) {

		IWL_DEBUG_DROP(priv, "Dropping - !iwl_is_associated\n");

		goto drop_unlock;

	}



	hdr_len = ieee80211_hdrlen(fc);



	/* Find (or create) index into station table for destination station */

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

+0 −9
Original line number Diff line number Diff line
@@ -504,15 +504,6 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
		IWL_DEBUG_TX(priv, "Sending REASSOC frame\n");

#endif



	/* drop all non-injected data frame if we are not associated */

	if (ieee80211_is_data(fc) &&

	    !(info->flags & IEEE80211_TX_CTL_INJECTED) &&

	    (!iwl_is_associated(priv) ||

	     ((priv->iw_mode == NL80211_IFTYPE_STATION) && !priv->assoc_id))) {

		IWL_DEBUG_DROP(priv, "Dropping - !iwl_is_associated\n");

		goto drop_unlock;

	}



	spin_unlock_irqrestore(&priv->lock, flags);



	hdr_len = ieee80211_hdrlen(fc);