aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2100.c38
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c74
2 files changed, 56 insertions, 56 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index fe63bf21c67e..2088ac029b35 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2140,7 +2140,7 @@ static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
2140 DECLARE_SSID_BUF(ssid); 2140 DECLARE_SSID_BUF(ssid);
2141 2141
2142 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC, 2142 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
2143 "disassociated: '%s' %pM \n", 2143 "disassociated: '%s' %pM\n",
2144 print_ssid(ssid, priv->essid, priv->essid_len), 2144 print_ssid(ssid, priv->essid, priv->essid_len),
2145 priv->bssid); 2145 priv->bssid);
2146 2146
@@ -3285,7 +3285,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv)
3285 3285
3286 if (inta & IPW2100_INTA_PARITY_ERROR) { 3286 if (inta & IPW2100_INTA_PARITY_ERROR) {
3287 printk(KERN_ERR DRV_NAME 3287 printk(KERN_ERR DRV_NAME
3288 ": ***** PARITY ERROR INTERRUPT !!!! \n"); 3288 ": ***** PARITY ERROR INTERRUPT !!!!\n");
3289 priv->inta_other++; 3289 priv->inta_other++;
3290 write_register(dev, IPW_REG_INTA, IPW2100_INTA_PARITY_ERROR); 3290 write_register(dev, IPW_REG_INTA, IPW2100_INTA_PARITY_ERROR);
3291 } 3291 }
@@ -6753,7 +6753,7 @@ static int ipw2100_wx_set_freq(struct net_device *dev,
6753 err = -EOPNOTSUPP; 6753 err = -EOPNOTSUPP;
6754 goto done; 6754 goto done;
6755 } else { /* Set the channel */ 6755 } else { /* Set the channel */
6756 IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m); 6756 IPW_DEBUG_WX("SET Freq/Channel -> %d\n", fwrq->m);
6757 err = ipw2100_set_channel(priv, fwrq->m, 0); 6757 err = ipw2100_set_channel(priv, fwrq->m, 0);
6758 } 6758 }
6759 6759
@@ -6782,7 +6782,7 @@ static int ipw2100_wx_get_freq(struct net_device *dev,
6782 else 6782 else
6783 wrqu->freq.m = 0; 6783 wrqu->freq.m = 0;
6784 6784
6785 IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel); 6785 IPW_DEBUG_WX("GET Freq/Channel -> %d\n", priv->channel);
6786 return 0; 6786 return 0;
6787 6787
6788} 6788}
@@ -6794,7 +6794,7 @@ static int ipw2100_wx_set_mode(struct net_device *dev,
6794 struct ipw2100_priv *priv = libipw_priv(dev); 6794 struct ipw2100_priv *priv = libipw_priv(dev);
6795 int err = 0; 6795 int err = 0;
6796 6796
6797 IPW_DEBUG_WX("SET Mode -> %d \n", wrqu->mode); 6797 IPW_DEBUG_WX("SET Mode -> %d\n", wrqu->mode);
6798 6798
6799 if (wrqu->mode == priv->ieee->iw_mode) 6799 if (wrqu->mode == priv->ieee->iw_mode)
6800 return 0; 6800 return 0;
@@ -7149,7 +7149,7 @@ static int ipw2100_wx_set_nick(struct net_device *dev,
7149 memset(priv->nick, 0, sizeof(priv->nick)); 7149 memset(priv->nick, 0, sizeof(priv->nick));
7150 memcpy(priv->nick, extra, wrqu->data.length); 7150 memcpy(priv->nick, extra, wrqu->data.length);
7151 7151
7152 IPW_DEBUG_WX("SET Nickname -> %s \n", priv->nick); 7152 IPW_DEBUG_WX("SET Nickname -> %s\n", priv->nick);
7153 7153
7154 return 0; 7154 return 0;
7155} 7155}
@@ -7168,7 +7168,7 @@ static int ipw2100_wx_get_nick(struct net_device *dev,
7168 memcpy(extra, priv->nick, wrqu->data.length); 7168 memcpy(extra, priv->nick, wrqu->data.length);
7169 wrqu->data.flags = 1; /* active */ 7169 wrqu->data.flags = 1; /* active */
7170 7170
7171 IPW_DEBUG_WX("GET Nickname -> %s \n", extra); 7171 IPW_DEBUG_WX("GET Nickname -> %s\n", extra);
7172 7172
7173 return 0; 7173 return 0;
7174} 7174}
@@ -7207,7 +7207,7 @@ static int ipw2100_wx_set_rate(struct net_device *dev,
7207 7207
7208 err = ipw2100_set_tx_rates(priv, rate, 0); 7208 err = ipw2100_set_tx_rates(priv, rate, 0);
7209 7209
7210 IPW_DEBUG_WX("SET Rate -> %04X \n", rate); 7210 IPW_DEBUG_WX("SET Rate -> %04X\n", rate);
7211 done: 7211 done:
7212 mutex_unlock(&priv->action_mutex); 7212 mutex_unlock(&priv->action_mutex);
7213 return err; 7213 return err;
@@ -7258,7 +7258,7 @@ static int ipw2100_wx_get_rate(struct net_device *dev,
7258 wrqu->bitrate.value = 0; 7258 wrqu->bitrate.value = 0;
7259 } 7259 }
7260 7260
7261 IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value); 7261 IPW_DEBUG_WX("GET Rate -> %d\n", wrqu->bitrate.value);
7262 7262
7263 done: 7263 done:
7264 mutex_unlock(&priv->action_mutex); 7264 mutex_unlock(&priv->action_mutex);
@@ -7294,7 +7294,7 @@ static int ipw2100_wx_set_rts(struct net_device *dev,
7294 7294
7295 err = ipw2100_set_rts_threshold(priv, value); 7295 err = ipw2100_set_rts_threshold(priv, value);
7296 7296
7297 IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X \n", value); 7297 IPW_DEBUG_WX("SET RTS Threshold -> 0x%08X\n", value);
7298 done: 7298 done:
7299 mutex_unlock(&priv->action_mutex); 7299 mutex_unlock(&priv->action_mutex);
7300 return err; 7300 return err;
@@ -7316,7 +7316,7 @@ static int ipw2100_wx_get_rts(struct net_device *dev,
7316 /* If RTS is set to the default value, then it is disabled */ 7316 /* If RTS is set to the default value, then it is disabled */
7317 wrqu->rts.disabled = (priv->rts_threshold & RTS_DISABLED) ? 1 : 0; 7317 wrqu->rts.disabled = (priv->rts_threshold & RTS_DISABLED) ? 1 : 0;
7318 7318
7319 IPW_DEBUG_WX("GET RTS Threshold -> 0x%08X \n", wrqu->rts.value); 7319 IPW_DEBUG_WX("GET RTS Threshold -> 0x%08X\n", wrqu->rts.value);
7320 7320
7321 return 0; 7321 return 0;
7322} 7322}
@@ -7355,7 +7355,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev,
7355 7355
7356 err = ipw2100_set_tx_power(priv, value); 7356 err = ipw2100_set_tx_power(priv, value);
7357 7357
7358 IPW_DEBUG_WX("SET TX Power -> %d \n", value); 7358 IPW_DEBUG_WX("SET TX Power -> %d\n", value);
7359 7359
7360 done: 7360 done:
7361 mutex_unlock(&priv->action_mutex); 7361 mutex_unlock(&priv->action_mutex);
@@ -7384,7 +7384,7 @@ static int ipw2100_wx_get_txpow(struct net_device *dev,
7384 7384
7385 wrqu->txpower.flags = IW_TXPOW_DBM; 7385 wrqu->txpower.flags = IW_TXPOW_DBM;
7386 7386
7387 IPW_DEBUG_WX("GET TX Power -> %d \n", wrqu->txpower.value); 7387 IPW_DEBUG_WX("GET TX Power -> %d\n", wrqu->txpower.value);
7388 7388
7389 return 0; 7389 return 0;
7390} 7390}
@@ -7414,7 +7414,7 @@ static int ipw2100_wx_set_frag(struct net_device *dev,
7414 priv->frag_threshold = priv->ieee->fts; 7414 priv->frag_threshold = priv->ieee->fts;
7415 } 7415 }
7416 7416
7417 IPW_DEBUG_WX("SET Frag Threshold -> %d \n", priv->ieee->fts); 7417 IPW_DEBUG_WX("SET Frag Threshold -> %d\n", priv->ieee->fts);
7418 7418
7419 return 0; 7419 return 0;
7420} 7420}
@@ -7432,7 +7432,7 @@ static int ipw2100_wx_get_frag(struct net_device *dev,
7432 wrqu->frag.fixed = 0; /* no auto select */ 7432 wrqu->frag.fixed = 0; /* no auto select */
7433 wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0; 7433 wrqu->frag.disabled = (priv->frag_threshold & FRAG_DISABLED) ? 1 : 0;
7434 7434
7435 IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value); 7435 IPW_DEBUG_WX("GET Frag Threshold -> %d\n", wrqu->frag.value);
7436 7436
7437 return 0; 7437 return 0;
7438} 7438}
@@ -7458,14 +7458,14 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
7458 7458
7459 if (wrqu->retry.flags & IW_RETRY_SHORT) { 7459 if (wrqu->retry.flags & IW_RETRY_SHORT) {
7460 err = ipw2100_set_short_retry(priv, wrqu->retry.value); 7460 err = ipw2100_set_short_retry(priv, wrqu->retry.value);
7461 IPW_DEBUG_WX("SET Short Retry Limit -> %d \n", 7461 IPW_DEBUG_WX("SET Short Retry Limit -> %d\n",
7462 wrqu->retry.value); 7462 wrqu->retry.value);
7463 goto done; 7463 goto done;
7464 } 7464 }
7465 7465
7466 if (wrqu->retry.flags & IW_RETRY_LONG) { 7466 if (wrqu->retry.flags & IW_RETRY_LONG) {
7467 err = ipw2100_set_long_retry(priv, wrqu->retry.value); 7467 err = ipw2100_set_long_retry(priv, wrqu->retry.value);
7468 IPW_DEBUG_WX("SET Long Retry Limit -> %d \n", 7468 IPW_DEBUG_WX("SET Long Retry Limit -> %d\n",
7469 wrqu->retry.value); 7469 wrqu->retry.value);
7470 goto done; 7470 goto done;
7471 } 7471 }
@@ -7474,7 +7474,7 @@ static int ipw2100_wx_set_retry(struct net_device *dev,
7474 if (!err) 7474 if (!err)
7475 err = ipw2100_set_long_retry(priv, wrqu->retry.value); 7475 err = ipw2100_set_long_retry(priv, wrqu->retry.value);
7476 7476
7477 IPW_DEBUG_WX("SET Both Retry Limits -> %d \n", wrqu->retry.value); 7477 IPW_DEBUG_WX("SET Both Retry Limits -> %d\n", wrqu->retry.value);
7478 7478
7479 done: 7479 done:
7480 mutex_unlock(&priv->action_mutex); 7480 mutex_unlock(&priv->action_mutex);
@@ -7508,7 +7508,7 @@ static int ipw2100_wx_get_retry(struct net_device *dev,
7508 wrqu->retry.value = priv->short_retry_limit; 7508 wrqu->retry.value = priv->short_retry_limit;
7509 } 7509 }
7510 7510
7511 IPW_DEBUG_WX("GET Retry -> %d \n", wrqu->retry.value); 7511 IPW_DEBUG_WX("GET Retry -> %d\n", wrqu->retry.value);
7512 7512
7513 return 0; 7513 return 0;
7514} 7514}
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 7fa2a3e6ebb0..192abfdc5039 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -458,7 +458,7 @@ static u8 _ipw_read_reg8(struct ipw_priv *priv, u32 reg)
458{ 458{
459 u32 word; 459 u32 word;
460 _ipw_write32(priv, IPW_INDIRECT_ADDR, reg & IPW_INDIRECT_ADDR_MASK); 460 _ipw_write32(priv, IPW_INDIRECT_ADDR, reg & IPW_INDIRECT_ADDR_MASK);
461 IPW_DEBUG_IO(" reg = 0x%8X : \n", reg); 461 IPW_DEBUG_IO(" reg = 0x%8X :\n", reg);
462 word = _ipw_read32(priv, IPW_INDIRECT_DATA); 462 word = _ipw_read32(priv, IPW_INDIRECT_DATA);
463 return (word >> ((reg & 0x3) * 8)) & 0xff; 463 return (word >> ((reg & 0x3) * 8)) & 0xff;
464} 464}
@@ -472,7 +472,7 @@ static u32 _ipw_read_reg32(struct ipw_priv *priv, u32 reg)
472 472
473 _ipw_write32(priv, IPW_INDIRECT_ADDR, reg); 473 _ipw_write32(priv, IPW_INDIRECT_ADDR, reg);
474 value = _ipw_read32(priv, IPW_INDIRECT_DATA); 474 value = _ipw_read32(priv, IPW_INDIRECT_DATA);
475 IPW_DEBUG_IO(" reg = 0x%4X : value = 0x%4x \n", reg, value); 475 IPW_DEBUG_IO(" reg = 0x%4X : value = 0x%4x\n", reg, value);
476 return value; 476 return value;
477} 477}
478 478
@@ -2747,7 +2747,7 @@ static inline void ipw_fw_dma_reset_command_blocks(struct ipw_priv *priv)
2747static int ipw_fw_dma_enable(struct ipw_priv *priv) 2747static int ipw_fw_dma_enable(struct ipw_priv *priv)
2748{ /* start dma engine but no transfers yet */ 2748{ /* start dma engine but no transfers yet */
2749 2749
2750 IPW_DEBUG_FW(">> : \n"); 2750 IPW_DEBUG_FW(">> :\n");
2751 2751
2752 /* Start the dma */ 2752 /* Start the dma */
2753 ipw_fw_dma_reset_command_blocks(priv); 2753 ipw_fw_dma_reset_command_blocks(priv);
@@ -2755,7 +2755,7 @@ static int ipw_fw_dma_enable(struct ipw_priv *priv)
2755 /* Write CB base address */ 2755 /* Write CB base address */
2756 ipw_write_reg32(priv, IPW_DMA_I_CB_BASE, IPW_SHARED_SRAM_DMA_CONTROL); 2756 ipw_write_reg32(priv, IPW_DMA_I_CB_BASE, IPW_SHARED_SRAM_DMA_CONTROL);
2757 2757
2758 IPW_DEBUG_FW("<< : \n"); 2758 IPW_DEBUG_FW("<< :\n");
2759 return 0; 2759 return 0;
2760} 2760}
2761 2761
@@ -2770,7 +2770,7 @@ static void ipw_fw_dma_abort(struct ipw_priv *priv)
2770 ipw_write_reg32(priv, IPW_DMA_I_DMA_CONTROL, control); 2770 ipw_write_reg32(priv, IPW_DMA_I_DMA_CONTROL, control);
2771 priv->sram_desc.last_cb_index = 0; 2771 priv->sram_desc.last_cb_index = 0;
2772 2772
2773 IPW_DEBUG_FW("<< \n"); 2773 IPW_DEBUG_FW("<<\n");
2774} 2774}
2775 2775
2776static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index, 2776static int ipw_fw_dma_write_command_block(struct ipw_priv *priv, int index,
@@ -2821,29 +2821,29 @@ static void ipw_fw_dma_dump_command_block(struct ipw_priv *priv)
2821 2821
2822 IPW_DEBUG_FW(">> :\n"); 2822 IPW_DEBUG_FW(">> :\n");
2823 address = ipw_read_reg32(priv, IPW_DMA_I_CURRENT_CB); 2823 address = ipw_read_reg32(priv, IPW_DMA_I_CURRENT_CB);
2824 IPW_DEBUG_FW_INFO("Current CB is 0x%x \n", address); 2824 IPW_DEBUG_FW_INFO("Current CB is 0x%x\n", address);
2825 2825
2826 /* Read the DMA Controlor register */ 2826 /* Read the DMA Controlor register */
2827 register_value = ipw_read_reg32(priv, IPW_DMA_I_DMA_CONTROL); 2827 register_value = ipw_read_reg32(priv, IPW_DMA_I_DMA_CONTROL);
2828 IPW_DEBUG_FW_INFO("IPW_DMA_I_DMA_CONTROL is 0x%x \n", register_value); 2828 IPW_DEBUG_FW_INFO("IPW_DMA_I_DMA_CONTROL is 0x%x\n", register_value);
2829 2829
2830 /* Print the CB values */ 2830 /* Print the CB values */
2831 cb_fields_address = address; 2831 cb_fields_address = address;
2832 register_value = ipw_read_reg32(priv, cb_fields_address); 2832 register_value = ipw_read_reg32(priv, cb_fields_address);
2833 IPW_DEBUG_FW_INFO("Current CB ControlField is 0x%x \n", register_value); 2833 IPW_DEBUG_FW_INFO("Current CB Control Field is 0x%x\n", register_value);
2834 2834
2835 cb_fields_address += sizeof(u32); 2835 cb_fields_address += sizeof(u32);
2836 register_value = ipw_read_reg32(priv, cb_fields_address); 2836 register_value = ipw_read_reg32(priv, cb_fields_address);
2837 IPW_DEBUG_FW_INFO("Current CB Source Field is 0x%x \n", register_value); 2837 IPW_DEBUG_FW_INFO("Current CB Source Field is 0x%x\n", register_value);
2838 2838
2839 cb_fields_address += sizeof(u32); 2839 cb_fields_address += sizeof(u32);
2840 register_value = ipw_read_reg32(priv, cb_fields_address); 2840 register_value = ipw_read_reg32(priv, cb_fields_address);
2841 IPW_DEBUG_FW_INFO("Current CB Destination Field is 0x%x \n", 2841 IPW_DEBUG_FW_INFO("Current CB Destination Field is 0x%x\n",
2842 register_value); 2842 register_value);
2843 2843
2844 cb_fields_address += sizeof(u32); 2844 cb_fields_address += sizeof(u32);
2845 register_value = ipw_read_reg32(priv, cb_fields_address); 2845 register_value = ipw_read_reg32(priv, cb_fields_address);
2846 IPW_DEBUG_FW_INFO("Current CB Status Field is 0x%x \n", register_value); 2846 IPW_DEBUG_FW_INFO("Current CB Status Field is 0x%x\n", register_value);
2847 2847
2848 IPW_DEBUG_FW(">> :\n"); 2848 IPW_DEBUG_FW(">> :\n");
2849} 2849}
@@ -2859,7 +2859,7 @@ static int ipw_fw_dma_command_block_index(struct ipw_priv *priv)
2859 current_cb_index = (current_cb_address - IPW_SHARED_SRAM_DMA_CONTROL) / 2859 current_cb_index = (current_cb_address - IPW_SHARED_SRAM_DMA_CONTROL) /
2860 sizeof(struct command_block); 2860 sizeof(struct command_block);
2861 2861
2862 IPW_DEBUG_FW_INFO("Current CB index 0x%x address = 0x%X \n", 2862 IPW_DEBUG_FW_INFO("Current CB index 0x%x address = 0x%X\n",
2863 current_cb_index, current_cb_address); 2863 current_cb_index, current_cb_address);
2864 2864
2865 IPW_DEBUG_FW(">> :\n"); 2865 IPW_DEBUG_FW(">> :\n");
@@ -2918,7 +2918,7 @@ static int ipw_fw_dma_add_buffer(struct ipw_priv *priv, dma_addr_t *src_address,
2918 int ret, i; 2918 int ret, i;
2919 u32 size; 2919 u32 size;
2920 2920
2921 IPW_DEBUG_FW(">> \n"); 2921 IPW_DEBUG_FW(">>\n");
2922 IPW_DEBUG_FW_INFO("nr=%d dest_address=0x%x len=0x%x\n", 2922 IPW_DEBUG_FW_INFO("nr=%d dest_address=0x%x len=0x%x\n",
2923 nr, dest_address, len); 2923 nr, dest_address, len);
2924 2924
@@ -2935,7 +2935,7 @@ static int ipw_fw_dma_add_buffer(struct ipw_priv *priv, dma_addr_t *src_address,
2935 IPW_DEBUG_FW_INFO(": Added new cb\n"); 2935 IPW_DEBUG_FW_INFO(": Added new cb\n");
2936 } 2936 }
2937 2937
2938 IPW_DEBUG_FW("<< \n"); 2938 IPW_DEBUG_FW("<<\n");
2939 return 0; 2939 return 0;
2940} 2940}
2941 2941
@@ -2944,7 +2944,7 @@ static int ipw_fw_dma_wait(struct ipw_priv *priv)
2944 u32 current_index = 0, previous_index; 2944 u32 current_index = 0, previous_index;
2945 u32 watchdog = 0; 2945 u32 watchdog = 0;
2946 2946
2947 IPW_DEBUG_FW(">> : \n"); 2947 IPW_DEBUG_FW(">> :\n");
2948 2948
2949 current_index = ipw_fw_dma_command_block_index(priv); 2949 current_index = ipw_fw_dma_command_block_index(priv);
2950 IPW_DEBUG_FW_INFO("sram_desc.last_cb_index:0x%08X\n", 2950 IPW_DEBUG_FW_INFO("sram_desc.last_cb_index:0x%08X\n",
@@ -2973,7 +2973,7 @@ static int ipw_fw_dma_wait(struct ipw_priv *priv)
2973 ipw_set_bit(priv, IPW_RESET_REG, 2973 ipw_set_bit(priv, IPW_RESET_REG,
2974 IPW_RESET_REG_MASTER_DISABLED | IPW_RESET_REG_STOP_MASTER); 2974 IPW_RESET_REG_MASTER_DISABLED | IPW_RESET_REG_STOP_MASTER);
2975 2975
2976 IPW_DEBUG_FW("<< dmaWaitSync \n"); 2976 IPW_DEBUG_FW("<< dmaWaitSync\n");
2977 return 0; 2977 return 0;
2978} 2978}
2979 2979
@@ -3034,7 +3034,7 @@ static int ipw_stop_master(struct ipw_priv *priv)
3034{ 3034{
3035 int rc; 3035 int rc;
3036 3036
3037 IPW_DEBUG_TRACE(">> \n"); 3037 IPW_DEBUG_TRACE(">>\n");
3038 /* stop master. typical delay - 0 */ 3038 /* stop master. typical delay - 0 */
3039 ipw_set_bit(priv, IPW_RESET_REG, IPW_RESET_REG_STOP_MASTER); 3039 ipw_set_bit(priv, IPW_RESET_REG, IPW_RESET_REG_STOP_MASTER);
3040 3040
@@ -3053,7 +3053,7 @@ static int ipw_stop_master(struct ipw_priv *priv)
3053 3053
3054static void ipw_arc_release(struct ipw_priv *priv) 3054static void ipw_arc_release(struct ipw_priv *priv)
3055{ 3055{
3056 IPW_DEBUG_TRACE(">> \n"); 3056 IPW_DEBUG_TRACE(">>\n");
3057 mdelay(5); 3057 mdelay(5);
3058 3058
3059 ipw_clear_bit(priv, IPW_RESET_REG, CBD_RESET_REG_PRINCETON_RESET); 3059 ipw_clear_bit(priv, IPW_RESET_REG, CBD_RESET_REG_PRINCETON_RESET);
@@ -3075,7 +3075,7 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len)
3075 3075
3076 image = (__le16 *) data; 3076 image = (__le16 *) data;
3077 3077
3078 IPW_DEBUG_TRACE(">> \n"); 3078 IPW_DEBUG_TRACE(">>\n");
3079 3079
3080 rc = ipw_stop_master(priv); 3080 rc = ipw_stop_master(priv);
3081 3081
@@ -3189,7 +3189,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
3189 u32 *virts[CB_NUMBER_OF_ELEMENTS_SMALL]; 3189 u32 *virts[CB_NUMBER_OF_ELEMENTS_SMALL];
3190 dma_addr_t phys[CB_NUMBER_OF_ELEMENTS_SMALL]; 3190 dma_addr_t phys[CB_NUMBER_OF_ELEMENTS_SMALL];
3191 3191
3192 IPW_DEBUG_TRACE("<< : \n"); 3192 IPW_DEBUG_TRACE("<< :\n");
3193 3193
3194 pool = pci_pool_create("ipw2200", priv->pci_dev, CB_MAX_LENGTH, 0, 0); 3194 pool = pci_pool_create("ipw2200", priv->pci_dev, CB_MAX_LENGTH, 0, 0);
3195 if (!pool) { 3195 if (!pool) {
@@ -4475,7 +4475,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4475 case CMAS_ASSOCIATED:{ 4475 case CMAS_ASSOCIATED:{
4476 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | 4476 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
4477 IPW_DL_ASSOC, 4477 IPW_DL_ASSOC,
4478 "associated: '%s' %pM \n", 4478 "associated: '%s' %pM\n",
4479 print_ssid(ssid, priv->essid, 4479 print_ssid(ssid, priv->essid,
4480 priv->essid_len), 4480 priv->essid_len),
4481 priv->bssid); 4481 priv->bssid);
@@ -4556,7 +4556,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4556 IPW_DL_ASSOC, 4556 IPW_DL_ASSOC,
4557 "deauthenticated: '%s' " 4557 "deauthenticated: '%s' "
4558 "%pM" 4558 "%pM"
4559 ": (0x%04X) - %s \n", 4559 ": (0x%04X) - %s\n",
4560 print_ssid(ssid, 4560 print_ssid(ssid,
4561 priv-> 4561 priv->
4562 essid, 4562 essid,
@@ -4607,7 +4607,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4607 4607
4608 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | 4608 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
4609 IPW_DL_ASSOC, 4609 IPW_DL_ASSOC,
4610 "disassociated: '%s' %pM \n", 4610 "disassociated: '%s' %pM\n",
4611 print_ssid(ssid, priv->essid, 4611 print_ssid(ssid, priv->essid,
4612 priv->essid_len), 4612 priv->essid_len),
4613 priv->bssid); 4613 priv->bssid);
@@ -4645,7 +4645,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4645 switch (auth->state) { 4645 switch (auth->state) {
4646 case CMAS_AUTHENTICATED: 4646 case CMAS_AUTHENTICATED:
4647 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE, 4647 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
4648 "authenticated: '%s' %pM \n", 4648 "authenticated: '%s' %pM\n",
4649 print_ssid(ssid, priv->essid, 4649 print_ssid(ssid, priv->essid,
4650 priv->essid_len), 4650 priv->essid_len),
4651 priv->bssid); 4651 priv->bssid);
@@ -6918,7 +6918,7 @@ static u8 ipw_qos_current_mode(struct ipw_priv * priv)
6918 } else { 6918 } else {
6919 mode = priv->ieee->mode; 6919 mode = priv->ieee->mode;
6920 } 6920 }
6921 IPW_DEBUG_QOS("QoS network/card mode %d \n", mode); 6921 IPW_DEBUG_QOS("QoS network/card mode %d\n", mode);
6922 return mode; 6922 return mode;
6923} 6923}
6924 6924
@@ -6958,7 +6958,7 @@ static int ipw_qos_handle_probe_response(struct ipw_priv *priv,
6958 &def_parameters_OFDM, size); 6958 &def_parameters_OFDM, size);
6959 6959
6960 if ((network->qos_data.active == 1) && (active_network == 1)) { 6960 if ((network->qos_data.active == 1) && (active_network == 1)) {
6961 IPW_DEBUG_QOS("QoS was disabled call qos_activate \n"); 6961 IPW_DEBUG_QOS("QoS was disabled call qos_activate\n");
6962 schedule_work(&priv->qos_activate); 6962 schedule_work(&priv->qos_activate);
6963 } 6963 }
6964 6964
@@ -7535,7 +7535,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
7535 return err; 7535 return err;
7536 } 7536 }
7537 7537
7538 IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %pM \n", 7538 IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %pM\n",
7539 print_ssid(ssid, priv->essid, priv->essid_len), 7539 print_ssid(ssid, priv->essid, priv->essid_len),
7540 priv->bssid); 7540 priv->bssid);
7541 7541
@@ -8786,7 +8786,7 @@ static int ipw_wx_set_freq(struct net_device *dev,
8786 } 8786 }
8787 } 8787 }
8788 8788
8789 IPW_DEBUG_WX("SET Freq/Channel -> %d \n", fwrq->m); 8789 IPW_DEBUG_WX("SET Freq/Channel -> %d\n", fwrq->m);
8790 mutex_lock(&priv->mutex); 8790 mutex_lock(&priv->mutex);
8791 ret = ipw_set_channel(priv, channel); 8791 ret = ipw_set_channel(priv, channel);
8792 mutex_unlock(&priv->mutex); 8792 mutex_unlock(&priv->mutex);
@@ -8828,7 +8828,7 @@ static int ipw_wx_get_freq(struct net_device *dev,
8828 wrqu->freq.m = 0; 8828 wrqu->freq.m = 0;
8829 8829
8830 mutex_unlock(&priv->mutex); 8830 mutex_unlock(&priv->mutex);
8831 IPW_DEBUG_WX("GET Freq/Channel -> %d \n", priv->channel); 8831 IPW_DEBUG_WX("GET Freq/Channel -> %d\n", priv->channel);
8832 return 0; 8832 return 0;
8833} 8833}
8834 8834
@@ -9223,7 +9223,7 @@ static int ipw_wx_get_sens(struct net_device *dev,
9223 wrqu->sens.value = priv->roaming_threshold; 9223 wrqu->sens.value = priv->roaming_threshold;
9224 mutex_unlock(&priv->mutex); 9224 mutex_unlock(&priv->mutex);
9225 9225
9226 IPW_DEBUG_WX("GET roaming threshold -> %s %d \n", 9226 IPW_DEBUG_WX("GET roaming threshold -> %s %d\n",
9227 wrqu->power.disabled ? "OFF" : "ON", wrqu->power.value); 9227 wrqu->power.disabled ? "OFF" : "ON", wrqu->power.value);
9228 9228
9229 return 0; 9229 return 0;
@@ -9351,7 +9351,7 @@ static int ipw_wx_get_rate(struct net_device *dev,
9351 wrqu->bitrate.value = priv->last_rate; 9351 wrqu->bitrate.value = priv->last_rate;
9352 wrqu->bitrate.fixed = (priv->config & CFG_FIXED_RATE) ? 1 : 0; 9352 wrqu->bitrate.fixed = (priv->config & CFG_FIXED_RATE) ? 1 : 0;
9353 mutex_unlock(&priv->mutex); 9353 mutex_unlock(&priv->mutex);
9354 IPW_DEBUG_WX("GET Rate -> %d \n", wrqu->bitrate.value); 9354 IPW_DEBUG_WX("GET Rate -> %d\n", wrqu->bitrate.value);
9355 return 0; 9355 return 0;
9356} 9356}
9357 9357
@@ -9374,7 +9374,7 @@ static int ipw_wx_set_rts(struct net_device *dev,
9374 9374
9375 ipw_send_rts_threshold(priv, priv->rts_threshold); 9375 ipw_send_rts_threshold(priv, priv->rts_threshold);
9376 mutex_unlock(&priv->mutex); 9376 mutex_unlock(&priv->mutex);
9377 IPW_DEBUG_WX("SET RTS Threshold -> %d \n", priv->rts_threshold); 9377 IPW_DEBUG_WX("SET RTS Threshold -> %d\n", priv->rts_threshold);
9378 return 0; 9378 return 0;
9379} 9379}
9380 9380
@@ -9388,7 +9388,7 @@ static int ipw_wx_get_rts(struct net_device *dev,
9388 wrqu->rts.fixed = 0; /* no auto select */ 9388 wrqu->rts.fixed = 0; /* no auto select */
9389 wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD); 9389 wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD);
9390 mutex_unlock(&priv->mutex); 9390 mutex_unlock(&priv->mutex);
9391 IPW_DEBUG_WX("GET RTS Threshold -> %d \n", wrqu->rts.value); 9391 IPW_DEBUG_WX("GET RTS Threshold -> %d\n", wrqu->rts.value);
9392 return 0; 9392 return 0;
9393} 9393}
9394 9394
@@ -9438,7 +9438,7 @@ static int ipw_wx_get_txpow(struct net_device *dev,
9438 wrqu->power.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0; 9438 wrqu->power.disabled = (priv->status & STATUS_RF_KILL_MASK) ? 1 : 0;
9439 mutex_unlock(&priv->mutex); 9439 mutex_unlock(&priv->mutex);
9440 9440
9441 IPW_DEBUG_WX("GET TX Power -> %s %d \n", 9441 IPW_DEBUG_WX("GET TX Power -> %s %d\n",
9442 wrqu->power.disabled ? "OFF" : "ON", wrqu->power.value); 9442 wrqu->power.disabled ? "OFF" : "ON", wrqu->power.value);
9443 9443
9444 return 0; 9444 return 0;
@@ -9464,7 +9464,7 @@ static int ipw_wx_set_frag(struct net_device *dev,
9464 9464
9465 ipw_send_frag_threshold(priv, wrqu->frag.value); 9465 ipw_send_frag_threshold(priv, wrqu->frag.value);
9466 mutex_unlock(&priv->mutex); 9466 mutex_unlock(&priv->mutex);
9467 IPW_DEBUG_WX("SET Frag Threshold -> %d \n", wrqu->frag.value); 9467 IPW_DEBUG_WX("SET Frag Threshold -> %d\n", wrqu->frag.value);
9468 return 0; 9468 return 0;
9469} 9469}
9470 9470
@@ -9478,7 +9478,7 @@ static int ipw_wx_get_frag(struct net_device *dev,
9478 wrqu->frag.fixed = 0; /* no auto select */ 9478 wrqu->frag.fixed = 0; /* no auto select */
9479 wrqu->frag.disabled = (wrqu->frag.value == DEFAULT_FTS); 9479 wrqu->frag.disabled = (wrqu->frag.value == DEFAULT_FTS);
9480 mutex_unlock(&priv->mutex); 9480 mutex_unlock(&priv->mutex);
9481 IPW_DEBUG_WX("GET Frag Threshold -> %d \n", wrqu->frag.value); 9481 IPW_DEBUG_WX("GET Frag Threshold -> %d\n", wrqu->frag.value);
9482 9482
9483 return 0; 9483 return 0;
9484} 9484}
@@ -9542,7 +9542,7 @@ static int ipw_wx_get_retry(struct net_device *dev,
9542 } 9542 }
9543 mutex_unlock(&priv->mutex); 9543 mutex_unlock(&priv->mutex);
9544 9544
9545 IPW_DEBUG_WX("GET retry -> %d \n", wrqu->retry.value); 9545 IPW_DEBUG_WX("GET retry -> %d\n", wrqu->retry.value);
9546 9546
9547 return 0; 9547 return 0;
9548} 9548}