Commit 04baaa27 authored Nov 13, 2012 by Johannes Berg

iwlwifi: fix monitor mode FCS flag



When the firmware is in SNIFFER mode, it leaves
the FCS at the end of frame. Not telling mac80211
means it won't add the right flag to the radiotap
header and that confuses wireshark.

Since mac80211 doesn't have a per-packet flag, set
the HW flag dynamically. This works as the monitor
vif can only be present in the driver by itself.

This fixes a regression introduced by my

commit 57897726
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Fri May 11 10:53:18 2012 +0200

    iwlwifi: support explicit monitor interface

Cc: stable@vger.kernel.org [3.5+]
Reported-by: MARK PHILLIPS <mark.phillips@virgin.net>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 31df3bb7

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -1354,6 +1354,20 @@ static int iwlagn_mac_add_interface(struct ieee80211_hw *hw,
		vif_priv->ctx = ctx;
		ctx->vif = vif;

		/*
		* In SNIFFER device type, the firmware reports the FCS to
		* the host, rather than snipping it off. Unfortunately,
		* mac80211 doesn't (yet) provide a per-packet flag for
		* this, so that we have to set the hardware flag based
		* on the interfaces added. As the monitor interface can
		* only be present by itself, and will be removed before
		* other interfaces are added, this is safe.
		*/
		if (vif->type == NL80211_IFTYPE_MONITOR)
		priv->hw->flags \|= IEEE80211_HW_RX_INCLUDES_FCS;
		else
		priv->hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;

		err = iwl_setup_interface(priv, ctx);
		if (!err \|\| reset)
		goto out;