diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
| commit | 3eacdf58c2c0b9507afedfc19108e98b992c31e4 (patch) | |
| tree | d95e7e022ff6e6181edce43fe97cf2883b5a91ed /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | dd0a251c8e087bca05e8f9a3657078591ae6e12b (diff) | |
| parent | 5376071069ec8a7e6a8112beab16fc24f5139475 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 5da6b35cd26d..0dc8eed16404 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -2482,7 +2482,7 @@ static int iwl_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
| 2482 | dev_kfree_skb_any(skb); | 2482 | dev_kfree_skb_any(skb); |
| 2483 | 2483 | ||
| 2484 | IWL_DEBUG_MACDUMP("leave\n"); | 2484 | IWL_DEBUG_MACDUMP("leave\n"); |
| 2485 | return 0; | 2485 | return NETDEV_TX_OK; |
| 2486 | } | 2486 | } |
| 2487 | 2487 | ||
| 2488 | static int iwl_mac_add_interface(struct ieee80211_hw *hw, | 2488 | static int iwl_mac_add_interface(struct ieee80211_hw *hw, |