aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:35:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-08-24 16:35:40 -0400
commit268bae0b6879f238ba57f5f801958d1254e136f7 (patch)
tree132d1039370644b2c6a2d2f8903024de3e47b020 /drivers/net/wireless
parentd70e96932de55fb2c05b1c0af1dff178651a9b77 (diff)
parent6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.c drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/adm8211.c8
-rw-r--r--drivers/net/wireless/at76c50x-usb.c22
-rw-r--r--drivers/net/wireless/ath/ar9170/main.c4
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c8
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-1000.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-5000.c14
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c32
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c45
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c45
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h3
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h3
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c51
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c2
-rw-r--r--drivers/net/wireless/mwl8k.c34
-rw-r--r--drivers/net/wireless/p54/eeprom.c6
-rw-r--r--drivers/net/wireless/p54/fwio.c2
-rw-r--r--drivers/net/wireless/p54/led.c4
-rw-r--r--drivers/net/wireless/p54/p54pci.c2
-rw-r--r--drivers/net/wireless/p54/txrx.c2
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180_dev.c6
-rw-r--r--drivers/net/wireless/rtl818x/rtl8187_dev.c4
-rw-r--r--drivers/net/wireless/rtl818x/rtl8187_rtl8225.c4
24 files changed, 174 insertions, 137 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index a105087af963..f9aa1bc0a947 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -732,7 +732,7 @@ static int adm8211_rf_set_channel(struct ieee80211_hw *dev, unsigned int chan)
732 732
733 /* Nothing to do for ADMtek BBP */ 733 /* Nothing to do for ADMtek BBP */
734 } else if (priv->bbp_type != ADM8211_TYPE_ADMTEK) 734 } else if (priv->bbp_type != ADM8211_TYPE_ADMTEK)
735 wiphy_debug(dev->wiphy, "unsupported bbp type %d\n", 735 wiphy_debug(dev->wiphy, "unsupported BBP type %d\n",
736 priv->bbp_type); 736 priv->bbp_type);
737 737
738 ADM8211_RESTORE(); 738 ADM8211_RESTORE();
@@ -1032,7 +1032,7 @@ static int adm8211_hw_init_bbp(struct ieee80211_hw *dev)
1032 break; 1032 break;
1033 } 1033 }
1034 } else 1034 } else
1035 wiphy_debug(dev->wiphy, "unsupported bbp %d\n", priv->bbp_type); 1035 wiphy_debug(dev->wiphy, "unsupported BBP %d\n", priv->bbp_type);
1036 1036
1037 ADM8211_CSR_WRITE(SYNRF, 0); 1037 ADM8211_CSR_WRITE(SYNRF, 0);
1038 1038
@@ -1525,7 +1525,7 @@ static int adm8211_start(struct ieee80211_hw *dev)
1525 retval = request_irq(priv->pdev->irq, adm8211_interrupt, 1525 retval = request_irq(priv->pdev->irq, adm8211_interrupt,
1526 IRQF_SHARED, "adm8211", dev); 1526 IRQF_SHARED, "adm8211", dev);
1527 if (retval) { 1527 if (retval) {
1528 wiphy_err(dev->wiphy, "failed to register irq handler\n"); 1528 wiphy_err(dev->wiphy, "failed to register IRQ handler\n");
1529 goto fail; 1529 goto fail;
1530 } 1530 }
1531 1531
@@ -1902,7 +1902,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
1902 goto err_free_eeprom; 1902 goto err_free_eeprom;
1903 } 1903 }
1904 1904
1905 wiphy_info(dev->wiphy, "hwaddr %pm, rev 0x%02x\n", 1905 wiphy_info(dev->wiphy, "hwaddr %pM, Rev 0x%02x\n",
1906 dev->wiphy->perm_addr, pdev->revision); 1906 dev->wiphy->perm_addr, pdev->revision);
1907 1907
1908 return 0; 1908 return 0;
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index a267bf55574c..91c5f73b5ba3 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -655,7 +655,7 @@ static int at76_get_hw_config(struct at76_priv *priv)
655exit: 655exit:
656 kfree(hwcfg); 656 kfree(hwcfg);
657 if (ret < 0) 657 if (ret < 0)
658 wiphy_err(priv->hw->wiphy, "cannot get hw config (error %d)\n", 658 wiphy_err(priv->hw->wiphy, "cannot get HW Config (error %d)\n",
659 ret); 659 ret);
660 660
661 return ret; 661 return ret;
@@ -960,7 +960,7 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv)
960 sizeof(struct mib_mac_addr)); 960 sizeof(struct mib_mac_addr));
961 if (ret < 0) { 961 if (ret < 0) {
962 wiphy_err(priv->hw->wiphy, 962 wiphy_err(priv->hw->wiphy,
963 "at76_get_mib (mac_addr) failed: %d\n", ret); 963 "at76_get_mib (MAC_ADDR) failed: %d\n", ret);
964 goto exit; 964 goto exit;
965 } 965 }
966 966
@@ -989,7 +989,7 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv)
989 sizeof(struct mib_mac_wep)); 989 sizeof(struct mib_mac_wep));
990 if (ret < 0) { 990 if (ret < 0) {
991 wiphy_err(priv->hw->wiphy, 991 wiphy_err(priv->hw->wiphy,
992 "at76_get_mib (mac_wep) failed: %d\n", ret); 992 "at76_get_mib (MAC_WEP) failed: %d\n", ret);
993 goto exit; 993 goto exit;
994 } 994 }
995 995
@@ -1026,7 +1026,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv)
1026 sizeof(struct mib_mac_mgmt)); 1026 sizeof(struct mib_mac_mgmt));
1027 if (ret < 0) { 1027 if (ret < 0) {
1028 wiphy_err(priv->hw->wiphy, 1028 wiphy_err(priv->hw->wiphy,
1029 "at76_get_mib (mac_mgmt) failed: %d\n", ret); 1029 "at76_get_mib (MAC_MGMT) failed: %d\n", ret);
1030 goto exit; 1030 goto exit;
1031 } 1031 }
1032 1032
@@ -1062,7 +1062,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv)
1062 ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac)); 1062 ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac));
1063 if (ret < 0) { 1063 if (ret < 0) {
1064 wiphy_err(priv->hw->wiphy, 1064 wiphy_err(priv->hw->wiphy,
1065 "at76_get_mib (mac) failed: %d\n", ret); 1065 "at76_get_mib (MAC) failed: %d\n", ret);
1066 goto exit; 1066 goto exit;
1067 } 1067 }
1068 1068
@@ -1099,7 +1099,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv)
1099 ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy)); 1099 ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy));
1100 if (ret < 0) { 1100 if (ret < 0) {
1101 wiphy_err(priv->hw->wiphy, 1101 wiphy_err(priv->hw->wiphy,
1102 "at76_get_mib (phy) failed: %d\n", ret); 1102 "at76_get_mib (PHY) failed: %d\n", ret);
1103 goto exit; 1103 goto exit;
1104 } 1104 }
1105 1105
@@ -1132,7 +1132,7 @@ static void at76_dump_mib_local(struct at76_priv *priv)
1132 ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local)); 1132 ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local));
1133 if (ret < 0) { 1133 if (ret < 0) {
1134 wiphy_err(priv->hw->wiphy, 1134 wiphy_err(priv->hw->wiphy,
1135 "at76_get_mib (local) failed: %d\n", ret); 1135 "at76_get_mib (LOCAL) failed: %d\n", ret);
1136 goto exit; 1136 goto exit;
1137 } 1137 }
1138 1138
@@ -1158,7 +1158,7 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv)
1158 sizeof(struct mib_mdomain)); 1158 sizeof(struct mib_mdomain));
1159 if (ret < 0) { 1159 if (ret < 0) {
1160 wiphy_err(priv->hw->wiphy, 1160 wiphy_err(priv->hw->wiphy,
1161 "at76_get_mib (mdomain) failed: %d\n", ret); 1161 "at76_get_mib (MDOMAIN) failed: %d\n", ret);
1162 goto exit; 1162 goto exit;
1163 } 1163 }
1164 1164
@@ -1229,7 +1229,7 @@ static int at76_submit_rx_urb(struct at76_priv *priv)
1229 struct sk_buff *skb = priv->rx_skb; 1229 struct sk_buff *skb = priv->rx_skb;
1230 1230
1231 if (!priv->rx_urb) { 1231 if (!priv->rx_urb) {
1232 wiphy_err(priv->hw->wiphy, "%s: priv->rx_urb is null\n", 1232 wiphy_err(priv->hw->wiphy, "%s: priv->rx_urb is NULL\n",
1233 __func__); 1233 __func__);
1234 return -EFAULT; 1234 return -EFAULT;
1235 } 1235 }
@@ -1792,7 +1792,7 @@ static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
1792 wiphy_err(priv->hw->wiphy, "error in tx submit urb: %d\n", ret); 1792 wiphy_err(priv->hw->wiphy, "error in tx submit urb: %d\n", ret);
1793 if (ret == -EINVAL) 1793 if (ret == -EINVAL)
1794 wiphy_err(priv->hw->wiphy, 1794 wiphy_err(priv->hw->wiphy,
1795 "-einval: tx urb %p hcpriv %p complete %p\n", 1795 "-EINVAL: tx urb %p hcpriv %p complete %p\n",
1796 priv->tx_urb, 1796 priv->tx_urb,
1797 priv->tx_urb->hcpriv, priv->tx_urb->complete); 1797 priv->tx_urb->hcpriv, priv->tx_urb->complete);
1798 } 1798 }
@@ -2311,7 +2311,7 @@ static int at76_init_new_device(struct at76_priv *priv,
2311 2311
2312 priv->mac80211_registered = 1; 2312 priv->mac80211_registered = 1;
2313 2313
2314 wiphy_info(priv->hw->wiphy, "usb %s, mac %pm, firmware %d.%d.%d-%d\n", 2314 wiphy_info(priv->hw->wiphy, "USB %s, MAC %pM, firmware %d.%d.%d-%d\n",
2315 dev_name(&interface->dev), priv->mac_addr, 2315 dev_name(&interface->dev), priv->mac_addr,
2316 priv->fw_version.major, priv->fw_version.minor, 2316 priv->fw_version.major, priv->fw_version.minor,
2317 priv->fw_version.patch, priv->fw_version.build); 2317 priv->fw_version.patch, priv->fw_version.build);
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index 29d2253ad7e4..32bf79e6a320 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -245,7 +245,7 @@ static void __ar9170_dump_txstats(struct ar9170 *ar)
245{ 245{
246 int i; 246 int i;
247 247
248 wiphy_debug(ar->hw->wiphy, "qos queue stats\n"); 248 wiphy_debug(ar->hw->wiphy, "QoS queue stats\n");
249 249
250 for (i = 0; i < __AR9170_NUM_TXQ; i++) 250 for (i = 0; i < __AR9170_NUM_TXQ; i++)
251 wiphy_debug(ar->hw->wiphy, 251 wiphy_debug(ar->hw->wiphy,
@@ -387,7 +387,7 @@ static struct sk_buff *ar9170_get_queued_skb(struct ar9170 *ar,
387 if (mac && compare_ether_addr(ieee80211_get_DA(hdr), mac)) { 387 if (mac && compare_ether_addr(ieee80211_get_DA(hdr), mac)) {
388#ifdef AR9170_QUEUE_DEBUG 388#ifdef AR9170_QUEUE_DEBUG
389 wiphy_debug(ar->hw->wiphy, 389 wiphy_debug(ar->hw->wiphy,
390 "skip frame => da %pm != %pm\n", 390 "skip frame => DA %pM != %pM\n",
391 mac, ieee80211_get_DA(hdr)); 391 mac, ieee80211_get_DA(hdr));
392 ar9170_print_txheader(ar, skb); 392 ar9170_print_txheader(ar, skb);
393#endif /* AR9170_QUEUE_DEBUG */ 393#endif /* AR9170_QUEUE_DEBUG */
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index 0c3963d38f82..ed69e60f86aa 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2723,14 +2723,6 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv)
2723 2723
2724 packet = &priv->rx_buffers[i]; 2724 packet = &priv->rx_buffers[i];
2725 2725
2726 /* Sync the DMA for the STATUS buffer so CPU is sure to get
2727 * the correct values */
2728 pci_dma_sync_single_for_cpu(priv->pci_dev,
2729 sq->nic +
2730 sizeof(struct ipw2100_status) * i,
2731 sizeof(struct ipw2100_status),
2732 PCI_DMA_FROMDEVICE);
2733
2734 /* Sync the DMA for the RX buffer so CPU is sure to get 2726 /* Sync the DMA for the RX buffer so CPU is sure to get
2735 * the correct values */ 2727 * the correct values */
2736 pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr, 2728 pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr,
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index f687a190f917..3bf5a30828be 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -270,7 +270,7 @@ struct iwl_cfg iwl1000_bgn_cfg = {
270 .support_ct_kill_exit = true, 270 .support_ct_kill_exit = true,
271 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, 271 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,
272 .chain_noise_scale = 1000, 272 .chain_noise_scale = 1000,
273 .monitor_recover_period = IWL_MONITORING_PERIOD, 273 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
274 .max_event_log_size = 128, 274 .max_event_log_size = 128,
275 .ucode_tracing = true, 275 .ucode_tracing = true,
276 .sensitivity_calib_by_driver = true, 276 .sensitivity_calib_by_driver = true,
@@ -302,7 +302,7 @@ struct iwl_cfg iwl1000_bg_cfg = {
302 .support_ct_kill_exit = true, 302 .support_ct_kill_exit = true,
303 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF, 303 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,
304 .chain_noise_scale = 1000, 304 .chain_noise_scale = 1000,
305 .monitor_recover_period = IWL_MONITORING_PERIOD, 305 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
306 .max_event_log_size = 128, 306 .max_event_log_size = 128,
307 .ucode_tracing = true, 307 .ucode_tracing = true,
308 .sensitivity_calib_by_driver = true, 308 .sensitivity_calib_by_driver = true,
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 6950a783913b..8ccfcd08218d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2731,7 +2731,7 @@ static struct iwl_cfg iwl3945_bg_cfg = {
2731 .led_compensation = 64, 2731 .led_compensation = 64,
2732 .broken_powersave = true, 2732 .broken_powersave = true,
2733 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 2733 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
2734 .monitor_recover_period = IWL_MONITORING_PERIOD, 2734 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
2735 .max_event_log_size = 512, 2735 .max_event_log_size = 512,
2736 .tx_power_by_driver = true, 2736 .tx_power_by_driver = true,
2737}; 2737};
@@ -2752,7 +2752,7 @@ static struct iwl_cfg iwl3945_abg_cfg = {
2752 .led_compensation = 64, 2752 .led_compensation = 64,
2753 .broken_powersave = true, 2753 .broken_powersave = true,
2754 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 2754 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
2755 .monitor_recover_period = IWL_MONITORING_PERIOD, 2755 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
2756 .max_event_log_size = 512, 2756 .max_event_log_size = 512,
2757 .tx_power_by_driver = true, 2757 .tx_power_by_driver = true,
2758}; 2758};
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 9415b71fa12d..f0a47f42d4b8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2322,7 +2322,7 @@ struct iwl_cfg iwl4965_agn_cfg = {
2322 .led_compensation = 61, 2322 .led_compensation = 61,
2323 .chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS, 2323 .chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS,
2324 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 2324 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
2325 .monitor_recover_period = IWL_MONITORING_PERIOD, 2325 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
2326 .temperature_kelvin = true, 2326 .temperature_kelvin = true,
2327 .max_event_log_size = 512, 2327 .max_event_log_size = 512,
2328 .tx_power_by_driver = true, 2328 .tx_power_by_driver = true,
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 0c2ea136cfd5..013f3dae69f1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -520,7 +520,7 @@ struct iwl_cfg iwl5300_agn_cfg = {
520 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 520 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
521 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 521 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
522 .chain_noise_scale = 1000, 522 .chain_noise_scale = 1000,
523 .monitor_recover_period = IWL_MONITORING_PERIOD, 523 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
524 .max_event_log_size = 512, 524 .max_event_log_size = 512,
525 .ucode_tracing = true, 525 .ucode_tracing = true,
526 .sensitivity_calib_by_driver = true, 526 .sensitivity_calib_by_driver = true,
@@ -551,7 +551,7 @@ struct iwl_cfg iwl5100_bgn_cfg = {
551 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 551 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
552 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 552 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
553 .chain_noise_scale = 1000, 553 .chain_noise_scale = 1000,
554 .monitor_recover_period = IWL_MONITORING_PERIOD, 554 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
555 .max_event_log_size = 512, 555 .max_event_log_size = 512,
556 .ucode_tracing = true, 556 .ucode_tracing = true,
557 .sensitivity_calib_by_driver = true, 557 .sensitivity_calib_by_driver = true,
@@ -580,7 +580,7 @@ struct iwl_cfg iwl5100_abg_cfg = {
580 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 580 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
581 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 581 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
582 .chain_noise_scale = 1000, 582 .chain_noise_scale = 1000,
583 .monitor_recover_period = IWL_MONITORING_PERIOD, 583 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
584 .max_event_log_size = 512, 584 .max_event_log_size = 512,
585 .ucode_tracing = true, 585 .ucode_tracing = true,
586 .sensitivity_calib_by_driver = true, 586 .sensitivity_calib_by_driver = true,
@@ -611,7 +611,7 @@ struct iwl_cfg iwl5100_agn_cfg = {
611 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 611 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
612 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 612 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
613 .chain_noise_scale = 1000, 613 .chain_noise_scale = 1000,
614 .monitor_recover_period = IWL_MONITORING_PERIOD, 614 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
615 .max_event_log_size = 512, 615 .max_event_log_size = 512,
616 .ucode_tracing = true, 616 .ucode_tracing = true,
617 .sensitivity_calib_by_driver = true, 617 .sensitivity_calib_by_driver = true,
@@ -642,7 +642,7 @@ struct iwl_cfg iwl5350_agn_cfg = {
642 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 642 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
643 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 643 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
644 .chain_noise_scale = 1000, 644 .chain_noise_scale = 1000,
645 .monitor_recover_period = IWL_MONITORING_PERIOD, 645 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
646 .max_event_log_size = 512, 646 .max_event_log_size = 512,
647 .ucode_tracing = true, 647 .ucode_tracing = true,
648 .sensitivity_calib_by_driver = true, 648 .sensitivity_calib_by_driver = true,
@@ -673,7 +673,7 @@ struct iwl_cfg iwl5150_agn_cfg = {
673 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 673 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
674 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 674 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
675 .chain_noise_scale = 1000, 675 .chain_noise_scale = 1000,
676 .monitor_recover_period = IWL_MONITORING_PERIOD, 676 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
677 .max_event_log_size = 512, 677 .max_event_log_size = 512,
678 .ucode_tracing = true, 678 .ucode_tracing = true,
679 .sensitivity_calib_by_driver = true, 679 .sensitivity_calib_by_driver = true,
@@ -703,7 +703,7 @@ struct iwl_cfg iwl5150_abg_cfg = {
703 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS, 703 .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
704 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF, 704 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
705 .chain_noise_scale = 1000, 705 .chain_noise_scale = 1000,
706 .monitor_recover_period = IWL_MONITORING_PERIOD, 706 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
707 .max_event_log_size = 512, 707 .max_event_log_size = 512,
708 .ucode_tracing = true, 708 .ucode_tracing = true,
709 .sensitivity_calib_by_driver = true, 709 .sensitivity_calib_by_driver = true,
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index e0c6c3afba27..9e390f698641 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -393,7 +393,7 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = {
393 .support_ct_kill_exit = true, 393 .support_ct_kill_exit = true,
394 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 394 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
395 .chain_noise_scale = 1000, 395 .chain_noise_scale = 1000,
396 .monitor_recover_period = IWL_MONITORING_PERIOD, 396 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
397 .max_event_log_size = 512, 397 .max_event_log_size = 512,
398 .ucode_tracing = true, 398 .ucode_tracing = true,
399 .sensitivity_calib_by_driver = true, 399 .sensitivity_calib_by_driver = true,
@@ -429,7 +429,7 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = {
429 .support_ct_kill_exit = true, 429 .support_ct_kill_exit = true,
430 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 430 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
431 .chain_noise_scale = 1000, 431 .chain_noise_scale = 1000,
432 .monitor_recover_period = IWL_MONITORING_PERIOD, 432 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
433 .max_event_log_size = 512, 433 .max_event_log_size = 512,
434 .sensitivity_calib_by_driver = true, 434 .sensitivity_calib_by_driver = true,
435 .chain_noise_calib_by_driver = true, 435 .chain_noise_calib_by_driver = true,
@@ -464,7 +464,7 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = {
464 .support_ct_kill_exit = true, 464 .support_ct_kill_exit = true,
465 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 465 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
466 .chain_noise_scale = 1000, 466 .chain_noise_scale = 1000,
467 .monitor_recover_period = IWL_MONITORING_PERIOD, 467 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
468 .max_event_log_size = 512, 468 .max_event_log_size = 512,
469 .sensitivity_calib_by_driver = true, 469 .sensitivity_calib_by_driver = true,
470 .chain_noise_calib_by_driver = true, 470 .chain_noise_calib_by_driver = true,
@@ -501,7 +501,7 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = {
501 .support_ct_kill_exit = true, 501 .support_ct_kill_exit = true,
502 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 502 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
503 .chain_noise_scale = 1000, 503 .chain_noise_scale = 1000,
504 .monitor_recover_period = IWL_MONITORING_PERIOD, 504 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
505 .max_event_log_size = 512, 505 .max_event_log_size = 512,
506 .sensitivity_calib_by_driver = true, 506 .sensitivity_calib_by_driver = true,
507 .chain_noise_calib_by_driver = true, 507 .chain_noise_calib_by_driver = true,
@@ -537,7 +537,7 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = {
537 .support_ct_kill_exit = true, 537 .support_ct_kill_exit = true,
538 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 538 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
539 .chain_noise_scale = 1000, 539 .chain_noise_scale = 1000,
540 .monitor_recover_period = IWL_MONITORING_PERIOD, 540 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
541 .max_event_log_size = 512, 541 .max_event_log_size = 512,
542 .sensitivity_calib_by_driver = true, 542 .sensitivity_calib_by_driver = true,
543 .chain_noise_calib_by_driver = true, 543 .chain_noise_calib_by_driver = true,
@@ -575,7 +575,7 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = {
575 .support_ct_kill_exit = true, 575 .support_ct_kill_exit = true,
576 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 576 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
577 .chain_noise_scale = 1000, 577 .chain_noise_scale = 1000,
578 .monitor_recover_period = IWL_MONITORING_PERIOD, 578 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
579 .max_event_log_size = 512, 579 .max_event_log_size = 512,
580 .sensitivity_calib_by_driver = true, 580 .sensitivity_calib_by_driver = true,
581 .chain_noise_calib_by_driver = true, 581 .chain_noise_calib_by_driver = true,
@@ -611,7 +611,7 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = {
611 .support_ct_kill_exit = true, 611 .support_ct_kill_exit = true,
612 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 612 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
613 .chain_noise_scale = 1000, 613 .chain_noise_scale = 1000,
614 .monitor_recover_period = IWL_MONITORING_PERIOD, 614 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
615 .max_event_log_size = 512, 615 .max_event_log_size = 512,
616 .sensitivity_calib_by_driver = true, 616 .sensitivity_calib_by_driver = true,
617 .chain_noise_calib_by_driver = true, 617 .chain_noise_calib_by_driver = true,
@@ -649,7 +649,7 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = {
649 .support_ct_kill_exit = true, 649 .support_ct_kill_exit = true,
650 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 650 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
651 .chain_noise_scale = 1000, 651 .chain_noise_scale = 1000,
652 .monitor_recover_period = IWL_MONITORING_PERIOD, 652 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
653 .max_event_log_size = 512, 653 .max_event_log_size = 512,
654 .sensitivity_calib_by_driver = true, 654 .sensitivity_calib_by_driver = true,
655 .chain_noise_calib_by_driver = true, 655 .chain_noise_calib_by_driver = true,
@@ -685,7 +685,7 @@ struct iwl_cfg iwl6000g2b_bg_cfg = {
685 .support_ct_kill_exit = true, 685 .support_ct_kill_exit = true,
686 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 686 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
687 .chain_noise_scale = 1000, 687 .chain_noise_scale = 1000,
688 .monitor_recover_period = IWL_MONITORING_PERIOD, 688 .monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
689 .max_event_log_size = 512, 689 .max_event_log_size = 512,
690 .sensitivity_calib_by_driver = true, 690 .sensitivity_calib_by_driver = true,
691 .chain_noise_calib_by_driver = true, 691 .chain_noise_calib_by_driver = true,
@@ -726,7 +726,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = {
726 .support_ct_kill_exit = true, 726 .support_ct_kill_exit = true,
727 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 727 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
728 .chain_noise_scale = 1000, 728 .chain_noise_scale = 1000,
729 .monitor_recover_period = IWL_MONITORING_PERIOD, 729 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
730 .max_event_log_size = 1024, 730 .max_event_log_size = 1024,
731 .ucode_tracing = true, 731 .ucode_tracing = true,
732 .sensitivity_calib_by_driver = true, 732 .sensitivity_calib_by_driver = true,
@@ -761,7 +761,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = {
761 .support_ct_kill_exit = true, 761 .support_ct_kill_exit = true,
762 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 762 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
763 .chain_noise_scale = 1000, 763 .chain_noise_scale = 1000,
764 .monitor_recover_period = IWL_MONITORING_PERIOD, 764 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
765 .max_event_log_size = 1024, 765 .max_event_log_size = 1024,
766 .ucode_tracing = true, 766 .ucode_tracing = true,
767 .sensitivity_calib_by_driver = true, 767 .sensitivity_calib_by_driver = true,
@@ -796,7 +796,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = {
796 .support_ct_kill_exit = true, 796 .support_ct_kill_exit = true,
797 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 797 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
798 .chain_noise_scale = 1000, 798 .chain_noise_scale = 1000,
799 .monitor_recover_period = IWL_MONITORING_PERIOD, 799 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
800 .max_event_log_size = 1024, 800 .max_event_log_size = 1024,
801 .ucode_tracing = true, 801 .ucode_tracing = true,
802 .sensitivity_calib_by_driver = true, 802 .sensitivity_calib_by_driver = true,
@@ -833,7 +833,7 @@ struct iwl_cfg iwl6050_2agn_cfg = {
833 .support_ct_kill_exit = true, 833 .support_ct_kill_exit = true,
834 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 834 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
835 .chain_noise_scale = 1500, 835 .chain_noise_scale = 1500,
836 .monitor_recover_period = IWL_MONITORING_PERIOD, 836 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
837 .max_event_log_size = 1024, 837 .max_event_log_size = 1024,
838 .ucode_tracing = true, 838 .ucode_tracing = true,
839 .sensitivity_calib_by_driver = true, 839 .sensitivity_calib_by_driver = true,
@@ -871,7 +871,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = {
871 .support_ct_kill_exit = true, 871 .support_ct_kill_exit = true,
872 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 872 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
873 .chain_noise_scale = 1500, 873 .chain_noise_scale = 1500,
874 .monitor_recover_period = IWL_MONITORING_PERIOD, 874 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
875 .max_event_log_size = 1024, 875 .max_event_log_size = 1024,
876 .ucode_tracing = true, 876 .ucode_tracing = true,
877 .sensitivity_calib_by_driver = true, 877 .sensitivity_calib_by_driver = true,
@@ -907,7 +907,7 @@ struct iwl_cfg iwl6050_2abg_cfg = {
907 .support_ct_kill_exit = true, 907 .support_ct_kill_exit = true,
908 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 908 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
909 .chain_noise_scale = 1500, 909 .chain_noise_scale = 1500,
910 .monitor_recover_period = IWL_MONITORING_PERIOD, 910 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
911 .max_event_log_size = 1024, 911 .max_event_log_size = 1024,
912 .ucode_tracing = true, 912 .ucode_tracing = true,
913 .sensitivity_calib_by_driver = true, 913 .sensitivity_calib_by_driver = true,
@@ -945,7 +945,7 @@ struct iwl_cfg iwl6000_3agn_cfg = {
945 .support_ct_kill_exit = true, 945 .support_ct_kill_exit = true,
946 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF, 946 .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
947 .chain_noise_scale = 1000, 947 .chain_noise_scale = 1000,
948 .monitor_recover_period = IWL_MONITORING_PERIOD, 948 .monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
949 .max_event_log_size = 1024, 949 .max_event_log_size = 1024,
950 .ucode_tracing = true, 950 .ucode_tracing = true,
951 .sensitivity_calib_by_driver = true, 951 .sensitivity_calib_by_driver = true,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 5b967c014b41..3ced9ea9c5fe 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3728,6 +3728,49 @@ out_exit:
3728 IWL_DEBUG_MAC80211(priv, "leave\n"); 3728 IWL_DEBUG_MAC80211(priv, "leave\n");
3729} 3729}
3730 3730
3731static void iwlagn_configure_filter(struct ieee80211_hw *hw,
3732 unsigned int changed_flags,
3733 unsigned int *total_flags,
3734 u64 multicast)
3735{
3736 struct iwl_priv *priv = hw->priv;
3737 __le32 filter_or = 0, filter_nand = 0;
3738
3739#define CHK(test, flag) do { \
3740 if (*total_flags & (test)) \
3741 filter_or |= (flag); \
3742 else \
3743 filter_nand |= (flag); \
3744 } while (0)
3745
3746 IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",
3747 changed_flags, *total_flags);
3748
3749 CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);
3750 CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);
3751 CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
3752
3753#undef CHK
3754
3755 mutex_lock(&priv->mutex);
3756
3757 priv->staging_rxon.filter_flags &= ~filter_nand;
3758 priv->staging_rxon.filter_flags |= filter_or;
3759
3760 iwlcore_commit_rxon(priv);
3761
3762 mutex_unlock(&priv->mutex);
3763
3764 /*
3765 * Receiving all multicast frames is always enabled by the
3766 * default flags setup in iwl_connection_init_rx_config()
3767 * since we currently do not support programming multicast
3768 * filters into the device.
3769 */
3770 *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
3771 FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
3772}
3773
3731static void iwl_mac_flush(struct ieee80211_hw *hw, bool drop) 3774static void iwl_mac_flush(struct ieee80211_hw *hw, bool drop)
3732{ 3775{
3733 struct iwl_priv *priv = hw->priv; 3776 struct iwl_priv *priv = hw->priv;
@@ -3928,7 +3971,7 @@ static struct ieee80211_ops iwl_hw_ops = {
3928 .add_interface = iwl_mac_add_interface, 3971 .add_interface = iwl_mac_add_interface,
3929 .remove_interface = iwl_mac_remove_interface, 3972 .remove_interface = iwl_mac_remove_interface,
3930 .config = iwl_mac_config, 3973 .config = iwl_mac_config,
3931 .configure_filter = iwl_configure_filter, 3974 .configure_filter = iwlagn_configure_filter,
3932 .set_key = iwl_mac_set_key, 3975 .set_key = iwl_mac_set_key,
3933 .update_tkip_key = iwl_mac_update_tkip_key, 3976 .update_tkip_key = iwl_mac_update_tkip_key,
3934 .conf_tx = iwl_mac_conf_tx, 3977 .conf_tx = iwl_mac_conf_tx,
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index ef713003682e..3d9443b9bec1 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1321,51 +1321,6 @@ out:
1321EXPORT_SYMBOL(iwl_apm_init); 1321EXPORT_SYMBOL(iwl_apm_init);
1322 1322
1323 1323
1324
1325void iwl_configure_filter(struct ieee80211_hw *hw,
1326 unsigned int changed_flags,
1327 unsigned int *total_flags,
1328 u64 multicast)
1329{
1330 struct iwl_priv *priv = hw->priv;
1331 __le32 filter_or = 0, filter_nand = 0;
1332
1333#define CHK(test, flag) do { \
1334 if (*total_flags & (test)) \
1335 filter_or |= (flag); \
1336 else \
1337 filter_nand |= (flag); \
1338 } while (0)
1339
1340 IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",
1341 changed_flags, *total_flags);
1342
1343 CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);
1344 CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);
1345 CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
1346
1347#undef CHK
1348
1349 mutex_lock(&priv->mutex);
1350
1351 priv->staging_rxon.filter_flags &= ~filter_nand;
1352 priv->staging_rxon.filter_flags |= filter_or;
1353
1354 iwlcore_commit_rxon(priv);
1355
1356 mutex_unlock(&priv->mutex);
1357
1358 /*
1359 * Receiving all multicast frames is always enabled by the
1360 * default flags setup in iwl_connection_init_rx_config()
1361 * since we currently do not support programming multicast
1362 * filters into the device.
1363 */
1364 *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
1365 FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
1366}
1367EXPORT_SYMBOL(iwl_configure_filter);
1368
1369int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) 1324int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
1370{ 1325{
1371 int ret = 0; 1326 int ret = 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 870c62d438a8..7b1e832bae56 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -389,9 +389,6 @@ int iwl_set_decrypted_flag(struct iwl_priv *priv,
389 u32 decrypt_res, 389 u32 decrypt_res,
390 struct ieee80211_rx_status *stats); 390 struct ieee80211_rx_status *stats);
391void iwl_irq_handle_error(struct iwl_priv *priv); 391void iwl_irq_handle_error(struct iwl_priv *priv);
392void iwl_configure_filter(struct ieee80211_hw *hw,
393 unsigned int changed_flags,
394 unsigned int *total_flags, u64 multicast);
395void iwl_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif); 392void iwl_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif);
396void iwl_bss_info_changed(struct ieee80211_hw *hw, 393void iwl_bss_info_changed(struct ieee80211_hw *hw,
397 struct ieee80211_vif *vif, 394 struct ieee80211_vif *vif,
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index f72fbf4dc92b..1ad330342ffc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1061,7 +1061,8 @@ struct iwl_event_log {
1061#define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5) 1061#define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)
1062 1062
1063/* timer constants use to monitor and recover stuck tx queues in mSecs */ 1063/* timer constants use to monitor and recover stuck tx queues in mSecs */
1064#define IWL_MONITORING_PERIOD (1000) 1064#define IWL_DEF_MONITORING_PERIOD (1000)
1065#define IWL_LONG_MONITORING_PERIOD (5000)
1065#define IWL_ONE_HUNDRED_MSECS (100) 1066#define IWL_ONE_HUNDRED_MSECS (100)
1066 1067
1067enum iwl_reset { 1068enum iwl_reset {
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 84494b1f833e..94d7e6e1323d 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3392,6 +3392,55 @@ static int iwl3945_mac_sta_add(struct ieee80211_hw *hw,
3392 3392
3393 return 0; 3393 return 0;
3394} 3394}
3395
3396static void iwl3945_configure_filter(struct ieee80211_hw *hw,
3397 unsigned int changed_flags,
3398 unsigned int *total_flags,
3399 u64 multicast)
3400{
3401 struct iwl_priv *priv = hw->priv;
3402 __le32 filter_or = 0, filter_nand = 0;
3403
3404#define CHK(test, flag) do { \
3405 if (*total_flags & (test)) \
3406 filter_or |= (flag); \
3407 else \
3408 filter_nand |= (flag); \
3409 } while (0)
3410
3411 IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",
3412 changed_flags, *total_flags);
3413
3414 CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);
3415 CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);
3416 CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
3417
3418#undef CHK
3419
3420 mutex_lock(&priv->mutex);
3421
3422 priv->staging_rxon.filter_flags &= ~filter_nand;
3423 priv->staging_rxon.filter_flags |= filter_or;
3424
3425 /*
3426 * Committing directly here breaks for some reason,
3427 * but we'll eventually commit the filter flags
3428 * change anyway.
3429 */
3430
3431 mutex_unlock(&priv->mutex);
3432
3433 /*
3434 * Receiving all multicast frames is always enabled by the
3435 * default flags setup in iwl_connection_init_rx_config()
3436 * since we currently do not support programming multicast
3437 * filters into the device.
3438 */
3439 *total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
3440 FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
3441}
3442
3443
3395/***************************************************************************** 3444/*****************************************************************************
3396 * 3445 *
3397 * sysfs attributes 3446 * sysfs attributes
@@ -3795,7 +3844,7 @@ static struct ieee80211_ops iwl3945_hw_ops = {
3795 .add_interface = iwl_mac_add_interface, 3844 .add_interface = iwl_mac_add_interface,
3796 .remove_interface = iwl_mac_remove_interface, 3845 .remove_interface = iwl_mac_remove_interface,
3797 .config = iwl_mac_config, 3846 .config = iwl_mac_config,
3798 .configure_filter = iwl_configure_filter, 3847 .configure_filter = iwl3945_configure_filter,
3799 .set_key = iwl3945_mac_set_key, 3848 .set_key = iwl3945_mac_set_key,
3800 .conf_tx = iwl_mac_conf_tx, 3849 .conf_tx = iwl_mac_conf_tx,
3801 .reset_tsf = iwl_mac_reset_tsf, 3850 .reset_tsf = iwl_mac_reset_tsf,
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index d9dd9f9d3040..298ba79fc51b 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -487,7 +487,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
487 struct ieee80211_rx_status rx_status; 487 struct ieee80211_rx_status rx_status;
488 488
489 if (data->idle) { 489 if (data->idle) {
490 wiphy_debug(hw->wiphy, "trying to tx when idle - reject\n"); 490 wiphy_debug(hw->wiphy, "Trying to TX when idle - reject\n");
491 return false; 491 return false;
492 } 492 }
493 493
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index d761ed2d8af4..f152a25be59f 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -910,14 +910,14 @@ static int mwl8k_rxq_init(struct ieee80211_hw *hw, int index)
910 910
911 rxq->rxd = pci_alloc_consistent(priv->pdev, size, &rxq->rxd_dma); 911 rxq->rxd = pci_alloc_consistent(priv->pdev, size, &rxq->rxd_dma);
912 if (rxq->rxd == NULL) { 912 if (rxq->rxd == NULL) {
913 wiphy_err(hw->wiphy, "failed to alloc rx descriptors\n"); 913 wiphy_err(hw->wiphy, "failed to alloc RX descriptors\n");
914 return -ENOMEM; 914 return -ENOMEM;
915 } 915 }
916 memset(rxq->rxd, 0, size); 916 memset(rxq->rxd, 0, size);
917 917
918 rxq->buf = kmalloc(MWL8K_RX_DESCS * sizeof(*rxq->buf), GFP_KERNEL); 918 rxq->buf = kmalloc(MWL8K_RX_DESCS * sizeof(*rxq->buf), GFP_KERNEL);
919 if (rxq->buf == NULL) { 919 if (rxq->buf == NULL) {
920 wiphy_err(hw->wiphy, "failed to alloc rx skbuff list\n"); 920 wiphy_err(hw->wiphy, "failed to alloc RX skbuff list\n");
921 pci_free_consistent(priv->pdev, size, rxq->rxd, rxq->rxd_dma); 921 pci_free_consistent(priv->pdev, size, rxq->rxd, rxq->rxd_dma);
922 return -ENOMEM; 922 return -ENOMEM;
923 } 923 }
@@ -1145,14 +1145,14 @@ static int mwl8k_txq_init(struct ieee80211_hw *hw, int index)
1145 1145
1146 txq->txd = pci_alloc_consistent(priv->pdev, size, &txq->txd_dma); 1146 txq->txd = pci_alloc_consistent(priv->pdev, size, &txq->txd_dma);
1147 if (txq->txd == NULL) { 1147 if (txq->txd == NULL) {
1148 wiphy_err(hw->wiphy, "failed to alloc tx descriptors\n"); 1148 wiphy_err(hw->wiphy, "failed to alloc TX descriptors\n");
1149 return -ENOMEM; 1149 return -ENOMEM;
1150 } 1150 }
1151 memset(txq->txd, 0, size); 1151 memset(txq->txd, 0, size);
1152 1152
1153 txq->skb = kmalloc(MWL8K_TX_DESCS * sizeof(*txq->skb), GFP_KERNEL); 1153 txq->skb = kmalloc(MWL8K_TX_DESCS * sizeof(*txq->skb), GFP_KERNEL);
1154 if (txq->skb == NULL) { 1154 if (txq->skb == NULL) {
1155 wiphy_err(hw->wiphy, "failed to alloc tx skbuff list\n"); 1155 wiphy_err(hw->wiphy, "failed to alloc TX skbuff list\n");
1156 pci_free_consistent(priv->pdev, size, txq->txd, txq->txd_dma); 1156 pci_free_consistent(priv->pdev, size, txq->txd, txq->txd_dma);
1157 return -ENOMEM; 1157 return -ENOMEM;
1158 } 1158 }
@@ -1573,7 +1573,7 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
1573 PCI_DMA_BIDIRECTIONAL); 1573 PCI_DMA_BIDIRECTIONAL);
1574 1574
1575 if (!timeout) { 1575 if (!timeout) {
1576 wiphy_err(hw->wiphy, "command %s timeout after %u ms\n", 1576 wiphy_err(hw->wiphy, "Command %s timeout after %u ms\n",
1577 mwl8k_cmd_name(cmd->code, buf, sizeof(buf)), 1577 mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
1578 MWL8K_CMD_TIMEOUT_MS); 1578 MWL8K_CMD_TIMEOUT_MS);
1579 rc = -ETIMEDOUT; 1579 rc = -ETIMEDOUT;
@@ -1584,11 +1584,11 @@ static int mwl8k_post_cmd(struct ieee80211_hw *hw, struct mwl8k_cmd_pkt *cmd)
1584 1584
1585 rc = cmd->result ? -EINVAL : 0; 1585 rc = cmd->result ? -EINVAL : 0;
1586 if (rc) 1586 if (rc)
1587 wiphy_err(hw->wiphy, "command %s error 0x%x\n", 1587 wiphy_err(hw->wiphy, "Command %s error 0x%x\n",
1588 mwl8k_cmd_name(cmd->code, buf, sizeof(buf)), 1588 mwl8k_cmd_name(cmd->code, buf, sizeof(buf)),
1589 le16_to_cpu(cmd->result)); 1589 le16_to_cpu(cmd->result));
1590 else if (ms > 2000) 1590 else if (ms > 2000)
1591 wiphy_notice(hw->wiphy, "command %s took %d ms\n", 1591 wiphy_notice(hw->wiphy, "Command %s took %d ms\n",
1592 mwl8k_cmd_name(cmd->code, 1592 mwl8k_cmd_name(cmd->code,
1593 buf, sizeof(buf)), 1593 buf, sizeof(buf)),
1594 ms); 1594 ms);
@@ -3210,7 +3210,7 @@ static int mwl8k_start(struct ieee80211_hw *hw)
3210 rc = request_irq(priv->pdev->irq, mwl8k_interrupt, 3210 rc = request_irq(priv->pdev->irq, mwl8k_interrupt,
3211 IRQF_SHARED, MWL8K_NAME, hw); 3211 IRQF_SHARED, MWL8K_NAME, hw);
3212 if (rc) { 3212 if (rc) {
3213 wiphy_err(hw->wiphy, "failed to register irq handler\n"); 3213 wiphy_err(hw->wiphy, "failed to register IRQ handler\n");
3214 return -EIO; 3214 return -EIO;
3215 } 3215 }
3216 3216
@@ -3926,7 +3926,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
3926 3926
3927 priv->sram = pci_iomap(pdev, 0, 0x10000); 3927 priv->sram = pci_iomap(pdev, 0, 0x10000);
3928 if (priv->sram == NULL) { 3928 if (priv->sram == NULL) {
3929 wiphy_err(hw->wiphy, "cannot map device sram\n"); 3929 wiphy_err(hw->wiphy, "Cannot map device SRAM\n");
3930 goto err_iounmap; 3930 goto err_iounmap;
3931 } 3931 }
3932 3932
@@ -3938,7 +3938,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
3938 if (priv->regs == NULL) { 3938 if (priv->regs == NULL) {
3939 priv->regs = pci_iomap(pdev, 2, 0x10000); 3939 priv->regs = pci_iomap(pdev, 2, 0x10000);
3940 if (priv->regs == NULL) { 3940 if (priv->regs == NULL) {
3941 wiphy_err(hw->wiphy, "cannot map device registers\n"); 3941 wiphy_err(hw->wiphy, "Cannot map device registers\n");
3942 goto err_iounmap; 3942 goto err_iounmap;
3943 } 3943 }
3944 } 3944 }
@@ -3950,14 +3950,14 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
3950 /* Ask userland hotplug daemon for the device firmware */ 3950 /* Ask userland hotplug daemon for the device firmware */
3951 rc = mwl8k_request_firmware(priv); 3951 rc = mwl8k_request_firmware(priv);
3952 if (rc) { 3952 if (rc) {
3953 wiphy_err(hw->wiphy, "firmware files not found\n"); 3953 wiphy_err(hw->wiphy, "Firmware files not found\n");
3954 goto err_stop_firmware; 3954 goto err_stop_firmware;
3955 } 3955 }
3956 3956
3957 /* Load firmware into hardware */ 3957 /* Load firmware into hardware */
3958 rc = mwl8k_load_firmware(hw); 3958 rc = mwl8k_load_firmware(hw);
3959 if (rc) { 3959 if (rc) {
3960 wiphy_err(hw->wiphy, "cannot start firmware\n"); 3960 wiphy_err(hw->wiphy, "Cannot start firmware\n");
3961 goto err_stop_firmware; 3961 goto err_stop_firmware;
3962 } 3962 }
3963 3963
@@ -4047,7 +4047,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
4047 rc = request_irq(priv->pdev->irq, mwl8k_interrupt, 4047 rc = request_irq(priv->pdev->irq, mwl8k_interrupt,
4048 IRQF_SHARED, MWL8K_NAME, hw); 4048 IRQF_SHARED, MWL8K_NAME, hw);
4049 if (rc) { 4049 if (rc) {
4050 wiphy_err(hw->wiphy, "failed to register irq handler\n"); 4050 wiphy_err(hw->wiphy, "failed to register IRQ handler\n");
4051 goto err_free_queues; 4051 goto err_free_queues;
4052 } 4052 }
4053 4053
@@ -4067,7 +4067,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
4067 rc = mwl8k_cmd_get_hw_spec_sta(hw); 4067 rc = mwl8k_cmd_get_hw_spec_sta(hw);
4068 } 4068 }
4069 if (rc) { 4069 if (rc) {
4070 wiphy_err(hw->wiphy, "cannot initialise firmware\n"); 4070 wiphy_err(hw->wiphy, "Cannot initialise firmware\n");
4071 goto err_free_irq; 4071 goto err_free_irq;
4072 } 4072 }
4073 4073
@@ -4081,14 +4081,14 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
4081 /* Turn radio off */ 4081 /* Turn radio off */
4082 rc = mwl8k_cmd_radio_disable(hw); 4082 rc = mwl8k_cmd_radio_disable(hw);
4083 if (rc) { 4083 if (rc) {
4084 wiphy_err(hw->wiphy, "cannot disable\n"); 4084 wiphy_err(hw->wiphy, "Cannot disable\n");
4085 goto err_free_irq; 4085 goto err_free_irq;
4086 } 4086 }
4087 4087
4088 /* Clear MAC address */ 4088 /* Clear MAC address */
4089 rc = mwl8k_cmd_set_mac_addr(hw, NULL, "\x00\x00\x00\x00\x00\x00"); 4089 rc = mwl8k_cmd_set_mac_addr(hw, NULL, "\x00\x00\x00\x00\x00\x00");
4090 if (rc) { 4090 if (rc) {
4091 wiphy_err(hw->wiphy, "cannot clear mac address\n"); 4091 wiphy_err(hw->wiphy, "Cannot clear MAC address\n");
4092 goto err_free_irq; 4092 goto err_free_irq;
4093 } 4093 }
4094 4094
@@ -4098,7 +4098,7 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
4098 4098
4099 rc = ieee80211_register_hw(hw); 4099 rc = ieee80211_register_hw(hw);
4100 if (rc) { 4100 if (rc) {
4101 wiphy_err(hw->wiphy, "cannot register device\n"); 4101 wiphy_err(hw->wiphy, "Cannot register device\n");
4102 goto err_free_queues; 4102 goto err_free_queues;
4103 } 4103 }
4104 4104
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 32d3f99b0844..8c05266d37f4 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -168,7 +168,7 @@ static int p54_generate_band(struct ieee80211_hw *dev,
168 } 168 }
169 169
170 if (j == 0) { 170 if (j == 0) {
171 wiphy_err(dev->wiphy, "disabling totally damaged %d GHz band\n", 171 wiphy_err(dev->wiphy, "Disabling totally damaged %d GHz band\n",
172 (band == IEEE80211_BAND_2GHZ) ? 2 : 5); 172 (band == IEEE80211_BAND_2GHZ) ? 2 : 5);
173 173
174 ret = -ENODATA; 174 ret = -ENODATA;
@@ -710,12 +710,12 @@ good_eeprom:
710 u8 perm_addr[ETH_ALEN]; 710 u8 perm_addr[ETH_ALEN];
711 711
712 wiphy_warn(dev->wiphy, 712 wiphy_warn(dev->wiphy,
713 "invalid hwaddr! using randomly generated mac addr\n"); 713 "Invalid hwaddr! Using randomly generated MAC addr\n");
714 random_ether_addr(perm_addr); 714 random_ether_addr(perm_addr);
715 SET_IEEE80211_PERM_ADDR(dev, perm_addr); 715 SET_IEEE80211_PERM_ADDR(dev, perm_addr);
716 } 716 }
717 717
718 wiphy_info(dev->wiphy, "hwaddr %pm, mac:isl38%02x rf:%s\n", 718 wiphy_info(dev->wiphy, "hwaddr %pM, MAC:isl38%02x RF:%s\n",
719 dev->wiphy->perm_addr, priv->version, 719 dev->wiphy->perm_addr, priv->version,
720 p54_rf_chips[priv->rxhw]); 720 p54_rf_chips[priv->rxhw]);
721 721
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 6f027ab4c775..92b9b1f05fd5 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -125,7 +125,7 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
125 125
126 if (fw_version) { 126 if (fw_version) {
127 wiphy_info(priv->hw->wiphy, 127 wiphy_info(priv->hw->wiphy,
128 "fw rev %s - softmac protocol %x.%x\n", 128 "FW rev %s - Softmac protocol %x.%x\n",
129 fw_version, priv->fw_var >> 8, priv->fw_var & 0xff); 129 fw_version, priv->fw_var >> 8, priv->fw_var & 0xff);
130 snprintf(dev->wiphy->fw_version, sizeof(dev->wiphy->fw_version), 130 snprintf(dev->wiphy->fw_version, sizeof(dev->wiphy->fw_version),
131 "%s - %x.%x", fw_version, 131 "%s - %x.%x", fw_version,
diff --git a/drivers/net/wireless/p54/led.c b/drivers/net/wireless/p54/led.c
index ea91f5cce6b3..3837e1eec5f4 100644
--- a/drivers/net/wireless/p54/led.c
+++ b/drivers/net/wireless/p54/led.c
@@ -58,7 +58,7 @@ static void p54_update_leds(struct work_struct *work)
58 err = p54_set_leds(priv); 58 err = p54_set_leds(priv);
59 if (err && net_ratelimit()) 59 if (err && net_ratelimit())
60 wiphy_err(priv->hw->wiphy, 60 wiphy_err(priv->hw->wiphy,
61 "failed to update leds (%d).\n", err); 61 "failed to update LEDs (%d).\n", err);
62 62
63 if (rerun) 63 if (rerun)
64 ieee80211_queue_delayed_work(priv->hw, &priv->led_work, 64 ieee80211_queue_delayed_work(priv->hw, &priv->led_work,
@@ -103,7 +103,7 @@ static int p54_register_led(struct p54_common *priv,
103 err = led_classdev_register(wiphy_dev(priv->hw->wiphy), &led->led_dev); 103 err = led_classdev_register(wiphy_dev(priv->hw->wiphy), &led->led_dev);
104 if (err) 104 if (err)
105 wiphy_err(priv->hw->wiphy, 105 wiphy_err(priv->hw->wiphy,
106 "failed to register %s led.\n", name); 106 "Failed to register %s LED.\n", name);
107 else 107 else
108 led->registered = 1; 108 led->registered = 1;
109 109
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 822f8dc26e9c..1eacba4daa5b 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -466,7 +466,7 @@ static int p54p_open(struct ieee80211_hw *dev)
466 P54P_READ(dev_int); 466 P54P_READ(dev_int);
467 467
468 if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) { 468 if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
469 wiphy_err(dev->wiphy, "cannot boot firmware!\n"); 469 wiphy_err(dev->wiphy, "Cannot boot firmware!\n");
470 p54p_stop(dev); 470 p54p_stop(dev);
471 return -ETIMEDOUT; 471 return -ETIMEDOUT;
472 } 472 }
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index e53f8cec7798..34447d1ad80d 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -540,7 +540,7 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)
540 case P54_TRAP_BEACON_TX: 540 case P54_TRAP_BEACON_TX:
541 break; 541 break;
542 case P54_TRAP_RADAR: 542 case P54_TRAP_RADAR:
543 wiphy_info(priv->hw->wiphy, "radar (freq:%d mhz)\n", freq); 543 wiphy_info(priv->hw->wiphy, "radar (freq:%d MHz)\n", freq);
544 break; 544 break;
545 case P54_TRAP_NO_BEACON: 545 case P54_TRAP_NO_BEACON:
546 if (priv->vif) 546 if (priv->vif)
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 9544eb1a23dc..05c6badbe201 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c
@@ -452,7 +452,7 @@ static int rtl8180_init_rx_ring(struct ieee80211_hw *dev)
452 &priv->rx_ring_dma); 452 &priv->rx_ring_dma);
453 453
454 if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) { 454 if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) {
455 wiphy_err(dev->wiphy, "cannot allocate rx ring\n"); 455 wiphy_err(dev->wiphy, "Cannot allocate RX ring\n");
456 return -ENOMEM; 456 return -ENOMEM;
457 } 457 }
458 458
@@ -509,7 +509,7 @@ static int rtl8180_init_tx_ring(struct ieee80211_hw *dev,
509 509
510 ring = pci_alloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma); 510 ring = pci_alloc_consistent(priv->pdev, sizeof(*ring) * entries, &dma);
511 if (!ring || (unsigned long)ring & 0xFF) { 511 if (!ring || (unsigned long)ring & 0xFF) {
512 wiphy_err(dev->wiphy, "cannot allocate tx ring (prio = %d)\n", 512 wiphy_err(dev->wiphy, "Cannot allocate TX ring (prio = %d)\n",
513 prio); 513 prio);
514 return -ENOMEM; 514 return -ENOMEM;
515 } 515 }
@@ -575,7 +575,7 @@ static int rtl8180_start(struct ieee80211_hw *dev)
575 ret = request_irq(priv->pdev->irq, rtl8180_interrupt, 575 ret = request_irq(priv->pdev->irq, rtl8180_interrupt,
576 IRQF_SHARED, KBUILD_MODNAME, dev); 576 IRQF_SHARED, KBUILD_MODNAME, dev);
577 if (ret) { 577 if (ret) {
578 wiphy_err(dev->wiphy, "failed to register irq handler\n"); 578 wiphy_err(dev->wiphy, "failed to register IRQ handler\n");
579 goto err_free_rings; 579 goto err_free_rings;
580 } 580 }
581 581
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 0801c1d7c8d4..38fa8244cc96 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -573,7 +573,7 @@ static int rtl8187_cmd_reset(struct ieee80211_hw *dev)
573 } while (--i); 573 } while (--i);
574 574
575 if (!i) { 575 if (!i) {
576 wiphy_err(dev->wiphy, "reset timeout!\n"); 576 wiphy_err(dev->wiphy, "Reset timeout!\n");
577 return -ETIMEDOUT; 577 return -ETIMEDOUT;
578 } 578 }
579 579
@@ -1525,7 +1525,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
1525 mutex_init(&priv->conf_mutex); 1525 mutex_init(&priv->conf_mutex);
1526 skb_queue_head_init(&priv->b_tx_status.queue); 1526 skb_queue_head_init(&priv->b_tx_status.queue);
1527 1527
1528 wiphy_info(dev->wiphy, "hwaddr %pm, %s v%d + %s, rfkill mask %d\n", 1528 wiphy_info(dev->wiphy, "hwaddr %pM, %s V%d + %s, rfkill mask %d\n",
1529 mac_addr, chip_name, priv->asic_rev, priv->rf->name, 1529 mac_addr, chip_name, priv->asic_rev, priv->rf->name,
1530 priv->rfkill_mask); 1530 priv->rfkill_mask);
1531 1531
diff --git a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
index fd96f9112322..97eebdcf7eb9 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
@@ -366,7 +366,7 @@ static void rtl8225_rf_init(struct ieee80211_hw *dev)
366 rtl8225_write(dev, 0x02, 0x044d); 366 rtl8225_write(dev, 0x02, 0x044d);
367 msleep(100); 367 msleep(100);
368 if (!(rtl8225_read(dev, 6) & (1 << 7))) 368 if (!(rtl8225_read(dev, 6) & (1 << 7)))
369 wiphy_warn(dev->wiphy, "rf calibration failed! %x\n", 369 wiphy_warn(dev->wiphy, "RF Calibration Failed! %x\n",
370 rtl8225_read(dev, 6)); 370 rtl8225_read(dev, 6));
371 } 371 }
372 372
@@ -735,7 +735,7 @@ static void rtl8225z2_rf_init(struct ieee80211_hw *dev)
735 rtl8225_write(dev, 0x02, 0x044D); 735 rtl8225_write(dev, 0x02, 0x044D);
736 msleep(100); 736 msleep(100);
737 if (!(rtl8225_read(dev, 6) & (1 << 7))) 737 if (!(rtl8225_read(dev, 6) & (1 << 7)))
738 wiphy_warn(dev->wiphy, "rf calibration failed! %x\n", 738 wiphy_warn(dev->wiphy, "RF Calibration Failed! %x\n",
739 rtl8225_read(dev, 6)); 739 rtl8225_read(dev, 6));
740 } 740 }
741 741
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-28 05:50:46 -0500