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

Commit 3e2236c1 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

iwl3945: fix merge mistake for packet injection 



We should allow packets transmission in monitor mode for 3945. The
patch fixes a merge error with 2.6.26 kernel.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2d3db679

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

+0 −6
Original line number Diff line number Diff line
@@ -6589,12 +6589,6 @@ static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 


	IWL_DEBUG_MAC80211("enter\n");



	if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {

		IWL_DEBUG_MAC80211("leave - monitor\n");

		dev_kfree_skb_any(skb);

		return 0;

	}



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

		     ieee80211_get_tx_rate(hw, IEEE80211_SKB_CB(skb))->bitrate);