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

Commit 57897726 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: support explicit monitor interface 



Support explicit monitor interface to keep
injection working after the HW queue changes.
This also finally enables sniffer mode.

Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 65781af6

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

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ void iwl_connection_init_rx_config(struct iwl_priv *priv, 
						  RXON_FILTER_ACCEPT_GRP_MSK;

		break;



	case NL80211_IFTYPE_MONITOR:

		ctx->staging.dev_type = RXON_DEV_TYPE_SNIFFER;

		break;



	default:

		IWL_ERR(priv, "Unsupported interface type %d\n",

			ctx->vif->type);

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

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags) 
	priv->contexts[IWL_RXON_CTX_BSS].wep_key_cmd = REPLY_WEPKEY;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;

	priv->contexts[IWL_RXON_CTX_BSS].exclusive_interface_modes =

		BIT(NL80211_IFTYPE_ADHOC);

		BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_MONITOR);

	priv->contexts[IWL_RXON_CTX_BSS].interface_modes =

		BIT(NL80211_IFTYPE_STATION);

	priv->contexts[IWL_RXON_CTX_BSS].ap_devtype = RXON_DEV_TYPE_AP;

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

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
		    IEEE80211_HW_QUEUE_CONTROL |

		    IEEE80211_HW_SUPPORTS_PS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

		    IEEE80211_HW_WANT_MONITOR_VIF |

		    IEEE80211_HW_SCAN_WHILE_IDLE;



	hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;