diff options
| author | Zhu Yi <yi.zhu@intel.com> | 2008-08-04 10:00:48 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-08-04 21:09:14 +0200 |
| commit | 3e2236c108792c3afbbfbe3f373ee7fdd68eda8e (patch) | |
| tree | b5fdb3c2c07885d7838dae0d4f7cf3747aacbdd0 | |
| parent | iwlwifi: grap nic access before accessing periphery registers (diff) | |
| download | linux-3e2236c108792c3afbbfbe3f373ee7fdd68eda8e.tar.xz linux-3e2236c108792c3afbbfbe3f373ee7fdd68eda8e.zip | |
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: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index eb41b02b506d..444847ab1b5a 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -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); |