diff options
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index b3300ffe4eec..758459e72f3d 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -2667,7 +2667,7 @@ static void ipw_fw_dma_abort(struct ipw_priv *priv) | |||
2667 | 2667 | ||
2668 | IPW_DEBUG_FW(">> :\n"); | 2668 | IPW_DEBUG_FW(">> :\n"); |
2669 | 2669 | ||
2670 | //set the Stop and Abort bit | 2670 | /* set the Stop and Abort bit */ |
2671 | control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_STOP_AND_ABORT; | 2671 | control = DMA_CONTROL_SMALL_CB_CONST_VALUE | DMA_CB_STOP_AND_ABORT; |
2672 | ipw_write_reg32(priv, IPW_DMA_I_DMA_CONTROL, control); | 2672 | ipw_write_reg32(priv, IPW_DMA_I_DMA_CONTROL, control); |
2673 | priv->sram_desc.last_cb_index = 0; | 2673 | priv->sram_desc.last_cb_index = 0; |
@@ -3002,8 +3002,6 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len) | |||
3002 | if (rc < 0) | 3002 | if (rc < 0) |
3003 | return rc; | 3003 | return rc; |
3004 | 3004 | ||
3005 | // spin_lock_irqsave(&priv->lock, flags); | ||
3006 | |||
3007 | for (addr = IPW_SHARED_LOWER_BOUND; | 3005 | for (addr = IPW_SHARED_LOWER_BOUND; |
3008 | addr < IPW_REGISTER_DOMAIN1_END; addr += 4) { | 3006 | addr < IPW_REGISTER_DOMAIN1_END; addr += 4) { |
3009 | ipw_write32(priv, addr, 0); | 3007 | ipw_write32(priv, addr, 0); |
@@ -3097,8 +3095,6 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len) | |||
3097 | firmware have problem getting alive resp. */ | 3095 | firmware have problem getting alive resp. */ |
3098 | ipw_write_reg8(priv, IPW_BASEBAND_CONTROL_STATUS, 0); | 3096 | ipw_write_reg8(priv, IPW_BASEBAND_CONTROL_STATUS, 0); |
3099 | 3097 | ||
3100 | // spin_unlock_irqrestore(&priv->lock, flags); | ||
3101 | |||
3102 | return rc; | 3098 | return rc; |
3103 | } | 3099 | } |
3104 | 3100 | ||
@@ -6387,13 +6383,6 @@ static int ipw_wx_set_genie(struct net_device *dev, | |||
6387 | (wrqu->data.length && extra == NULL)) | 6383 | (wrqu->data.length && extra == NULL)) |
6388 | return -EINVAL; | 6384 | return -EINVAL; |
6389 | 6385 | ||
6390 | //mutex_lock(&priv->mutex); | ||
6391 | |||
6392 | //if (!ieee->wpa_enabled) { | ||
6393 | // err = -EOPNOTSUPP; | ||
6394 | // goto out; | ||
6395 | //} | ||
6396 | |||
6397 | if (wrqu->data.length) { | 6386 | if (wrqu->data.length) { |
6398 | buf = kmalloc(wrqu->data.length, GFP_KERNEL); | 6387 | buf = kmalloc(wrqu->data.length, GFP_KERNEL); |
6399 | if (buf == NULL) { | 6388 | if (buf == NULL) { |
@@ -6413,7 +6402,6 @@ static int ipw_wx_set_genie(struct net_device *dev, | |||
6413 | 6402 | ||
6414 | ipw_wpa_assoc_frame(priv, ieee->wpa_ie, ieee->wpa_ie_len); | 6403 | ipw_wpa_assoc_frame(priv, ieee->wpa_ie, ieee->wpa_ie_len); |
6415 | out: | 6404 | out: |
6416 | //mutex_unlock(&priv->mutex); | ||
6417 | return err; | 6405 | return err; |
6418 | } | 6406 | } |
6419 | 6407 | ||
@@ -6426,13 +6414,6 @@ static int ipw_wx_get_genie(struct net_device *dev, | |||
6426 | struct ieee80211_device *ieee = priv->ieee; | 6414 | struct ieee80211_device *ieee = priv->ieee; |
6427 | int err = 0; | 6415 | int err = 0; |
6428 | 6416 | ||
6429 | //mutex_lock(&priv->mutex); | ||
6430 | |||
6431 | //if (!ieee->wpa_enabled) { | ||
6432 | // err = -EOPNOTSUPP; | ||
6433 | // goto out; | ||
6434 | //} | ||
6435 | |||
6436 | if (ieee->wpa_ie_len == 0 || ieee->wpa_ie == NULL) { | 6417 | if (ieee->wpa_ie_len == 0 || ieee->wpa_ie == NULL) { |
6437 | wrqu->data.length = 0; | 6418 | wrqu->data.length = 0; |
6438 | goto out; | 6419 | goto out; |
@@ -6447,7 +6428,6 @@ static int ipw_wx_get_genie(struct net_device *dev, | |||
6447 | memcpy(extra, ieee->wpa_ie, ieee->wpa_ie_len); | 6428 | memcpy(extra, ieee->wpa_ie, ieee->wpa_ie_len); |
6448 | 6429 | ||
6449 | out: | 6430 | out: |
6450 | //mutex_unlock(&priv->mutex); | ||
6451 | return err; | 6431 | return err; |
6452 | } | 6432 | } |
6453 | 6433 | ||
@@ -6558,7 +6538,6 @@ static int ipw_wx_set_auth(struct net_device *dev, | |||
6558 | ieee->ieee802_1x = param->value; | 6538 | ieee->ieee802_1x = param->value; |
6559 | break; | 6539 | break; |
6560 | 6540 | ||
6561 | //case IW_AUTH_ROAMING_CONTROL: | ||
6562 | case IW_AUTH_PRIVACY_INVOKED: | 6541 | case IW_AUTH_PRIVACY_INVOKED: |
6563 | ieee->privacy_invoked = param->value; | 6542 | ieee->privacy_invoked = param->value; |
6564 | break; | 6543 | break; |
@@ -6680,7 +6659,7 @@ static int ipw_wx_set_mlme(struct net_device *dev, | |||
6680 | 6659 | ||
6681 | switch (mlme->cmd) { | 6660 | switch (mlme->cmd) { |
6682 | case IW_MLME_DEAUTH: | 6661 | case IW_MLME_DEAUTH: |
6683 | // silently ignore | 6662 | /* silently ignore */ |
6684 | break; | 6663 | break; |
6685 | 6664 | ||
6686 | case IW_MLME_DISASSOC: | 6665 | case IW_MLME_DISASSOC: |
@@ -9766,7 +9745,7 @@ static int ipw_wx_set_monitor(struct net_device *dev, | |||
9766 | return 0; | 9745 | return 0; |
9767 | } | 9746 | } |
9768 | 9747 | ||
9769 | #endif // CONFIG_IPW2200_MONITOR | 9748 | #endif /* CONFIG_IPW2200_MONITOR */ |
9770 | 9749 | ||
9771 | static int ipw_wx_reset(struct net_device *dev, | 9750 | static int ipw_wx_reset(struct net_device *dev, |
9772 | struct iw_request_info *info, | 9751 | struct iw_request_info *info, |
@@ -10009,7 +9988,7 @@ static void init_sys_config(struct ipw_sys_config *sys_config) | |||
10009 | sys_config->dot11g_auto_detection = 0; | 9988 | sys_config->dot11g_auto_detection = 0; |
10010 | sys_config->enable_cts_to_self = 0; | 9989 | sys_config->enable_cts_to_self = 0; |
10011 | sys_config->bt_coexist_collision_thr = 0; | 9990 | sys_config->bt_coexist_collision_thr = 0; |
10012 | sys_config->pass_noise_stats_to_host = 1; //1 -- fix for 256 | 9991 | sys_config->pass_noise_stats_to_host = 1; /* 1 -- fix for 256 */ |
10013 | sys_config->silence_threshold = 0x1e; | 9992 | sys_config->silence_threshold = 0x1e; |
10014 | } | 9993 | } |
10015 | 9994 | ||