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

Commit 6afe6828 authored Jul 01, 2008 by Zhu Yi Committed by John W. Linville Jul 02, 2008

iwlwifi: drop skb silently for Tx request in monitor mode



This patch fixes the problem to keep mac80211 resubmitting SKBs
when Tx request cannot be met in monitor mode.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent ec04fd60

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -6687,7 +6687,8 @@ static int iwl3945_mac_tx(struct ieee80211_hw hw, struct sk_buff skb,

		if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {
		IWL_DEBUG_MAC80211("leave - monitor\n");
		return -1;
		dev_kfree_skb_any(skb);
		return 0;
		}

		IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -6237,7 +6237,8 @@ static int iwl4965_mac_tx(struct ieee80211_hw hw, struct sk_buff skb,

		if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {
		IWL_DEBUG_MAC80211("leave - monitor\n");
		return -1;
		dev_kfree_skb_any(skb);
		return 0;
		}

		IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,