diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
| commit | f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2 (patch) | |
| tree | 1612249d11d455cfd6a0d691f5564673ae179c5f /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
| parent | a6784ad7eafa74a085c8458909eda0699a8fcf57 (diff) | |
| parent | 8dd779b19ce5972072ad2372a86c8acbae4da768 (diff) | |
Merge branch 'x86/unify-pci' into x86/core
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 5ed16ce7846..0bd55bb1973 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -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, |