diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-02 22:13:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-02 22:13:20 -0700 |
| commit | 2fff58fce14701e27d5e8a50fa73caef9a6907f5 (patch) | |
| tree | 13d6fc0c0e0252bca62311a79bb358198fda26b1 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
| parent | c461a973118346d5c103aaaddd62e53939fd7c67 (diff) | |
| parent | 7b58ccfe32f40eca8c8ca29aa723a5d0e814f0c9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index b1b3c523185..6027e1119c3 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -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, |