diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945-mac.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 19a4d56dd0ab..1743accc1271 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -573,7 +573,6 @@ il3945_tx_skb(struct il_priv *il, struct sk_buff *skb) | |||
573 | len = (u16) skb->len; | 573 | len = (u16) skb->len; |
574 | tx_cmd->len = cpu_to_le16(len); | 574 | tx_cmd->len = cpu_to_le16(len); |
575 | 575 | ||
576 | il_dbg_log_tx_data_frame(il, len, hdr); | ||
577 | il_update_stats(il, true, fc, len); | 576 | il_update_stats(il, true, fc, len); |
578 | tx_cmd->tx_flags &= ~TX_CMD_FLG_ANT_A_MSK; | 577 | tx_cmd->tx_flags &= ~TX_CMD_FLG_ANT_A_MSK; |
579 | tx_cmd->tx_flags &= ~TX_CMD_FLG_ANT_B_MSK; | 578 | tx_cmd->tx_flags &= ~TX_CMD_FLG_ANT_B_MSK; |
@@ -3098,11 +3097,9 @@ il3945_store_debug_level(struct device *d, struct device_attribute *attr, | |||
3098 | ret = strict_strtoul(buf, 0, &val); | 3097 | ret = strict_strtoul(buf, 0, &val); |
3099 | if (ret) | 3098 | if (ret) |
3100 | IL_INFO("%s is not in hex or decimal form.\n", buf); | 3099 | IL_INFO("%s is not in hex or decimal form.\n", buf); |
3101 | else { | 3100 | else |
3102 | il->debug_level = val; | 3101 | il->debug_level = val; |
3103 | if (il_alloc_traffic_mem(il)) | 3102 | |
3104 | IL_ERR("Not enough memory to generate traffic log\n"); | ||
3105 | } | ||
3106 | return strnlen(buf, count); | 3103 | return strnlen(buf, count); |
3107 | } | 3104 | } |
3108 | 3105 | ||
@@ -3625,9 +3622,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3625 | il->pci_dev = pdev; | 3622 | il->pci_dev = pdev; |
3626 | il->inta_mask = CSR_INI_SET_MASK; | 3623 | il->inta_mask = CSR_INI_SET_MASK; |
3627 | 3624 | ||
3628 | if (il_alloc_traffic_mem(il)) | ||
3629 | IL_ERR("Not enough memory to generate traffic log\n"); | ||
3630 | |||
3631 | /*************************** | 3625 | /*************************** |
3632 | * 2. Initializing PCI bus | 3626 | * 2. Initializing PCI bus |
3633 | * *************************/ | 3627 | * *************************/ |
@@ -3790,7 +3784,6 @@ out_pci_disable_device: | |||
3790 | pci_set_drvdata(pdev, NULL); | 3784 | pci_set_drvdata(pdev, NULL); |
3791 | pci_disable_device(pdev); | 3785 | pci_disable_device(pdev); |
3792 | out_ieee80211_free_hw: | 3786 | out_ieee80211_free_hw: |
3793 | il_free_traffic_mem(il); | ||
3794 | ieee80211_free_hw(il->hw); | 3787 | ieee80211_free_hw(il->hw); |
3795 | out: | 3788 | out: |
3796 | return err; | 3789 | return err; |
@@ -3858,7 +3851,6 @@ il3945_pci_remove(struct pci_dev *pdev) | |||
3858 | * until now... */ | 3851 | * until now... */ |
3859 | destroy_workqueue(il->workqueue); | 3852 | destroy_workqueue(il->workqueue); |
3860 | il->workqueue = NULL; | 3853 | il->workqueue = NULL; |
3861 | il_free_traffic_mem(il); | ||
3862 | 3854 | ||
3863 | free_irq(pdev->irq, il); | 3855 | free_irq(pdev->irq, il); |
3864 | pci_disable_msi(pdev); | 3856 | pci_disable_msi(pdev); |