diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-03 01:13:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-03 01:13:20 -0400 |
| commit | 2fff58fce14701e27d5e8a50fa73caef9a6907f5 (patch) | |
| tree | 13d6fc0c0e0252bca62311a79bb358198fda26b1 /drivers/net/wireless/iwlwifi/iwl4965-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/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 5ed16ce78468..0bd55bb19739 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, | |||
| 6237 | 6237 | ||
| 6238 | if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { | 6238 | if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { |
| 6239 | IWL_DEBUG_MAC80211("leave - monitor\n"); | 6239 | IWL_DEBUG_MAC80211("leave - monitor\n"); |
| 6240 | return -1; | 6240 | dev_kfree_skb_any(skb); |
| 6241 | return 0; | ||
| 6241 | } | 6242 | } |
| 6242 | 6243 | ||
| 6243 | IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, | 6244 | IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, |