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

Commit aa065263 authored by Gábor Stefanik's avatar Gábor Stefanik Committed by John W. Linville
Browse files

iwlwifi: Make injection of non-broadcast frames work again 



Commit 1ccb84d87d04df3c76cd4352fe69786d8c7cf016 by Wey-Yi Guy
("iwlwifi: clean up unused NL80211_IFTYPE_MONITOR for Monitor mode")
broke injection of non-broadcast frames to unassociated stations
(causing a SYSASSERT for all such injected frames), due to injected
frames no longer automatically getting a broadcast station ID assigned.
This patch restores the old behavior, fixing the aforementioned
regression.

Also, consistently check for IEEE80211_TX_CTL_INJECTED instead of
iwl_is_monitor_mode in the TX path, as TX_CTL_INJECTED specifically
means that a given packet is coming from a monitor interface, while
iwl_is_monitor_mode only shows whether a monitor interface exists
on the device.

Signed-off-by: default avatarGábor Stefanik <netrolller.3d@gmail.com>
Acked-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9d45368a

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

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

#endif



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

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

	if (ieee80211_is_data(fc) &&

	    (!iwl_is_monitor_mode(priv) ||

	    !(info->flags & IEEE80211_TX_CTL_INJECTED)) && /* packet injection */

	    !(info->flags & IEEE80211_TX_CTL_INJECTED) &&

	    (!iwl_is_associated(priv) ||

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

	     !priv->assoc_station_added)) {
@@ -732,6 +731,9 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	hdr_len = ieee80211_hdrlen(fc);



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

	if (info->flags & IEEE80211_TX_CTL_INJECTED)

		sta_id = priv->hw_params.bcast_sta_id;

	else

		sta_id = iwl_get_sta_id(priv, hdr);

	if (sta_id == IWL_INVALID_STATION) {

		IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",

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

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

#endif



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

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

	if (ieee80211_is_data(fc) &&

	    (!iwl_is_monitor_mode(priv)) && /* packet injection */

	    !(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");
@@ -532,6 +532,9 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	hdr_len = ieee80211_hdrlen(fc);



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

	if (info->flags & IEEE80211_TX_CTL_INJECTED)

		sta_id = priv->hw_params.bcast_sta_id;

	else

		sta_id = iwl_get_sta_id(priv, hdr);

	if (sta_id == IWL_INVALID_STATION) {

		IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",