o wl3501: remove dead code that was surviving from original driver

It never was used for anything meaningful, i.e. driver_state never
is set to non zero.
parent ccce10df
...@@ -548,7 +548,6 @@ struct wl3501_card { ...@@ -548,7 +548,6 @@ struct wl3501_card {
u16 join_sta_bss; u16 join_sta_bss;
unsigned char rssi; unsigned char rssi;
u8 adhoc_times; u8 adhoc_times;
u8 driver_state;
u8 freq_domain; u8 freq_domain;
u8 version[2]; u8 version[2];
struct wl3501_scan_confirm bss_set[20]; struct wl3501_scan_confirm bss_set[20];
......
...@@ -599,23 +599,11 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr) ...@@ -599,23 +599,11 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)
wl3501_get_from_wla(this, addr, &signal, sizeof(signal)); wl3501_get_from_wla(this, addr, &signal, sizeof(signal));
if (signal.status == WL3501_STATUS_SUCCESS) { if (signal.status == WL3501_STATUS_SUCCESS) {
dprintk(3, "success"); dprintk(3, "success");
if (this->driver_state == WL3501_SIG_SCAN_REQ) { if ((this->net_type == IW_MODE_INFRA &&
for (i = 0; i < this->bss_cnt; i++) { (signal.cap_info & WL3501_MGMT_CAPABILITY_ESS)) ||
if (!memcmp((char *)this->bss_set[i].bssid, (this->net_type == IW_MODE_ADHOC &&
(char *)signal.bssid, ETH_ALEN)) (signal.cap_info & WL3501_MGMT_CAPABILITY_IBSS)) ||
break; this->net_type == IW_MODE_AUTO) {
}
if ((i == this->bss_cnt) && i < 20) {
memcpy((char *)
&(this->bss_set[i].beacon_period),
(char *)&(signal.beacon_period), 73);
this->bss_cnt++;
}
} else if ((this->net_type == IW_MODE_INFRA &&
(signal.cap_info & WL3501_MGMT_CAPABILITY_ESS)) ||
(this->net_type == IW_MODE_ADHOC &&
(signal.cap_info & WL3501_MGMT_CAPABILITY_IBSS)) ||
this->net_type == IW_MODE_AUTO) {
if (!this->essid[1]) if (!this->essid[1])
matchflag = 1; matchflag = 1;
else if (this->essid[1] == 3 && else if (this->essid[1] == 3 &&
...@@ -647,8 +635,7 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr) ...@@ -647,8 +635,7 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)
this->rssi = signal.rssi; this->rssi = signal.rssi;
} }
} }
} else if (signal.status == WL3501_STATUS_TIMEOUT && } else if (signal.status == WL3501_STATUS_TIMEOUT) {
this->driver_state != WL3501_SIG_SCAN_REQ) {
dprintk(3, "timeout"); dprintk(3, "timeout");
this->join_sta_bss = 0; this->join_sta_bss = 0;
for (i = this->join_sta_bss; i < this->bss_cnt; i++) for (i = this->join_sta_bss; i < this->bss_cnt; i++)
...@@ -2150,7 +2137,6 @@ static void wl3501_config(dev_link_t *link) ...@@ -2150,7 +2137,6 @@ static void wl3501_config(dev_link_t *link)
this->bss_cnt = 0; this->bss_cnt = 0;
this->join_sta_bss = 0; this->join_sta_bss = 0;
this->adhoc_times = 0; this->adhoc_times = 0;
this->driver_state = 0;
this->essid[0] = 0; this->essid[0] = 0;
this->essid[1] = 3; this->essid[1] = 3;
this->essid[2] = 'A'; this->essid[2] = 'A';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment