Skip to content

L
linux
Commit 7fbb760a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files
Options

o wl3501: use c99 init style for the signals 

also remove some unneeded casts.
parent c6bf92aa
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 120 deletions
drivers/net/wireless/wl3501_cs.c
View file @ 7fbb760a
...@@ -86,16 +86,8 @@ MODULE_PARM(pc_debug, "i"); ...@@ -86,16 +86,8 @@ MODULE_PARM(pc_debug, "i");
* was obtained from the Planet WAP 1000 Access Point web interface. -acme * was obtained from the Planet WAP 1000 Access Point web interface. -acme
*/ */
static int wl3501_chan2freq[] = { static int wl3501_chan2freq[] = {
[0] = 2412, [0] = 2412, [1] = 2417, [2] = 2422, [3] = 2427, [4] = 2432,
[1] = 2417, [5] = 2437, [6] = 2442, [7] = 2447, [8] = 2452, [9] = 2457,
[2] = 2422,
[3] = 2427,
[4] = 2432,
[5] = 2437,
[6] = 2442,
[7] = 2447,
[8] = 2452,
[9] = 2457,
[10] = 2462, [10] = 2462,
}; };
...@@ -141,7 +133,7 @@ static dev_info_t wl3501_dev_info = "wl3501_cs"; ...@@ -141,7 +133,7 @@ static dev_info_t wl3501_dev_info = "wl3501_cs";
*/ */
static dev_link_t *wl3501_dev_list; static dev_link_t *wl3501_dev_list;
static __inline__ void wl3501_switch_page(struct wl3501_card *this, u8 page) static inline void wl3501_switch_page(struct wl3501_card *this, u8 page)
{ {
wl3501_outb(page, this->base_addr + WL3501_NIC_BSS); wl3501_outb(page, this->base_addr + WL3501_NIC_BSS);
} }
...@@ -392,7 +384,7 @@ static int wl3501_send_pkt(struct wl3501_card *this, u8 *data, u16 len) ...@@ -392,7 +384,7 @@ static int wl3501_send_pkt(struct wl3501_card *this, u8 *data, u16 len)
wl3501_free_tx_buffer(this, sig_bf); wl3501_free_tx_buffer(this, sig_bf);
return -ENOMEM; return -ENOMEM;
} }
memcpy((char *)&(sig.daddr[0]), pdata, 12); memcpy(&sig.daddr[0], pdata, 12);
pktlen = len - 12; pktlen = len - 12;
pdata += 12; pdata += 12;
sig.next_blk = 0; sig.next_blk = 0;
...@@ -459,80 +451,79 @@ static int wl3501_send_pkt(struct wl3501_card *this, u8 *data, u16 len) ...@@ -459,80 +451,79 @@ static int wl3501_send_pkt(struct wl3501_card *this, u8 *data, u16 len)
static int wl3501_mgmt_resync(struct wl3501_card *this) static int wl3501_mgmt_resync(struct wl3501_card *this)
{ {
struct wl3501_resync_req signal; struct wl3501_resync_req sig = {
.sig_id = WL3501_SIG_RESYNC_REQ,
};
signal.next_blk = 0; return wl3501_esbq_exec(this, &sig, sizeof(sig));
signal.sig_id = WL3501_SIG_RESYNC_REQ;
return wl3501_esbq_exec(this, &signal, sizeof(signal));
} }
static int wl3501_mgmt_scan(struct wl3501_card *this, u16 chan_time) static inline int wl3501_fw_bss_type(struct wl3501_card *this)
{ {
struct wl3501_scan_req signal; return this->net_type == IW_MODE_INFRA ? WL3501_NET_TYPE_INFRA :
WL3501_NET_TYPE_ADHOC;
}
signal.next_blk = 0; static inline int wl3501_fw_cap_info(struct wl3501_card *this)
signal.sig_id = WL3501_SIG_SCAN_REQ; {
signal.ssid[0] = signal.ssid[1] = 0; return this->net_type == IW_MODE_INFRA ? WL3501_MGMT_CAPABILITY_ESS :
signal.scan_type = WL3501_SCAN_TYPE_ACTIVE; WL3501_MGMT_CAPABILITY_IBSS;
signal.probe_delay = 0x10; }
signal.min_chan_time = signal.max_chan_time = chan_time;
if (this->net_type == IW_MODE_INFRA) static int wl3501_mgmt_scan(struct wl3501_card *this, u16 chan_time)
signal.bss_type = WL3501_NET_TYPE_INFRA; {
else struct wl3501_scan_req sig = {
signal.bss_type = WL3501_NET_TYPE_ADHOC; .sig_id = WL3501_SIG_SCAN_REQ,
.scan_type = WL3501_SCAN_TYPE_ACTIVE,
.probe_delay = 0x10,
.min_chan_time = chan_time,
.max_chan_time = chan_time,
.bss_type = wl3501_fw_bss_type(this),
};
this->bss_cnt = this->join_sta_bss = 0; this->bss_cnt = this->join_sta_bss = 0;
return wl3501_esbq_exec(this, &signal, sizeof(signal)); return wl3501_esbq_exec(this, &sig, sizeof(sig));
} }
static int wl3501_mgmt_join(struct wl3501_card *this, u16 stas) static int wl3501_mgmt_join(struct wl3501_card *this, u16 stas)
{ {
struct wl3501_join_req signal; struct wl3501_join_req sig = {
.sig_id = WL3501_SIG_JOIN_REQ,
.timeout = 10,
.phy_pset = {
[2] = this->def_chan,
},
};
signal.next_blk = 0; memcpy(&sig.beacon_period, &this->bss_set[stas].beacon_period, 72);
signal.sig_id = WL3501_SIG_JOIN_REQ; return wl3501_esbq_exec(this, &sig, sizeof(sig));
signal.timeout = 10;
memcpy((char *)&(signal.beacon_period),
(char *)&(this->bss_set[stas].beacon_period), 72);
signal.phy_pset[2] = this->def_chan;
return wl3501_esbq_exec(this, &signal, sizeof(signal));
} }
static int wl3501_mgmt_start(struct wl3501_card *this) static int wl3501_mgmt_start(struct wl3501_card *this)
{ {
struct wl3501_start_req signal; struct wl3501_start_req sig = {
.sig_id = WL3501_SIG_START_REQ,
signal.next_blk = 0; .beacon_period = 400,
signal.sig_id = WL3501_SIG_START_REQ; .dtim_period = 1,
memcpy((char *)signal.ssid, (char *)this->essid, WL3501_ESSID_MAX_LEN); .phy_pset = {
memcpy((char *)this->keep_essid, (char *)this->essid, [0] = 3, [1] = 1, [2] = this->chan,
WL3501_ESSID_MAX_LEN); },
if (this->net_type == IW_MODE_INFRA) { .bss_basic_rate_set = {
signal.bss_type = WL3501_NET_TYPE_INFRA; [0] = 0x01, [1] = 0x02, [2] = 0x82, [3] = 0x84,
signal.cap_info = WL3501_MGMT_CAPABILITY_ESS; },
} else { .operational_rate_set = {
signal.bss_type = WL3501_NET_TYPE_ADHOC; [0] = 0x01, [1] = 0x02, [2] = 0x82, [3] = 0x84,
signal.cap_info = WL3501_MGMT_CAPABILITY_IBSS; },
} .ibss_pset = {
signal.beacon_period = 400; [0] = 6, [1] = 2, [2] = 10,
signal.dtim_period = 1; },
signal.phy_pset[0] = 3; .bss_type = wl3501_fw_bss_type(this),
signal.phy_pset[1] = 1; .cap_info = wl3501_fw_cap_info(this),
signal.phy_pset[2] = this->chan; };
signal.bss_basic_rate_set[0] = 0x01;
signal.bss_basic_rate_set[1] = 0x02; memcpy(sig.ssid, this->essid, WL3501_ESSID_MAX_LEN);
signal.bss_basic_rate_set[2] = 0x82; memcpy(this->keep_essid, this->essid, WL3501_ESSID_MAX_LEN);
signal.bss_basic_rate_set[3] = 0x84; return wl3501_esbq_exec(this, &sig, sizeof(sig));
signal.operational_rate_set[0] = 0x01;
signal.operational_rate_set[1] = 0x02;
signal.operational_rate_set[2] = 0x82;
signal.operational_rate_set[3] = 0x84;
signal.ibss_pset[0] = 6;
signal.ibss_pset[1] = 2;
signal.ibss_pset[2] = 10;
signal.ibss_pset[3] = 0;
return wl3501_esbq_exec(this, &signal, sizeof(signal));
} }
static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr) static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)
...@@ -557,26 +548,23 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr) ...@@ -557,26 +548,23 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)
matchflag = 1; matchflag = 1;
else if (this->essid[1] != signal.ssid[1]) else if (this->essid[1] != signal.ssid[1])
matchflag = 0; matchflag = 0;
else if (memcmp((char *)&(this->essid[2]), else if (memcmp(&this->essid[2], &signal.ssid[2],
(char *)&(signal.ssid[2]),
this->essid[1])) this->essid[1]))
matchflag = 0; matchflag = 0;
else else
matchflag = 1; matchflag = 1;
if (matchflag) { if (matchflag) {
for (i = 0; i < this->bss_cnt; i++) { for (i = 0; i < this->bss_cnt; i++) {
if (!memcmp if (!memcmp(this->bss_set[i].bssid,
((char *)this->bss_set[i].bssid, signal.bssid, ETH_ALEN)) {
(char *)signal.bssid, ETH_ALEN)) {
matchflag = 0; matchflag = 0;
break; break;
} }
} }
} }
if (matchflag && (i < 20)) { if (matchflag && (i < 20)) {
memcpy((char *) memcpy(&this->bss_set[i].beacon_period,
&(this->bss_set[i].beacon_period), &signal.beacon_period, 73);
(char *)&(signal.beacon_period), 73);
this->bss_cnt++; this->bss_cnt++;
this->rssi = signal.rssi; this->rssi = signal.rssi;
} }
...@@ -598,7 +586,6 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr) ...@@ -598,7 +586,6 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)
else else
wl3501_mgmt_scan(this, 100); wl3501_mgmt_scan(this, 100);
} }
} }
} }
} }
...@@ -656,8 +643,7 @@ static u16 wl3501_receive(struct wl3501_card *this, u8 *bf, u16 size) ...@@ -656,8 +643,7 @@ static u16 wl3501_receive(struct wl3501_card *this, u8 *bf, u16 size)
wl3501_get_from_wla(this, this->start_seg + 2, wl3501_get_from_wla(this, this->start_seg + 2,
&next_addr, sizeof(next_addr)); &next_addr, sizeof(next_addr));
if (this->ether_type == ARPHRD_ETHER) { if (this->ether_type == ARPHRD_ETHER) {
if (size > if (size > WL3501_BLKSZ - sizeof(struct wl3501_rx_hdr)) {
WL3501_BLKSZ - sizeof(struct wl3501_rx_hdr)) {
wl3501_get_from_wla(this, wl3501_get_from_wla(this,
this->start_seg + this->start_seg +
sizeof(struct wl3501_rx_hdr), sizeof(struct wl3501_rx_hdr),
...@@ -678,8 +664,7 @@ static u16 wl3501_receive(struct wl3501_card *this, u8 *bf, u16 size) ...@@ -678,8 +664,7 @@ static u16 wl3501_receive(struct wl3501_card *this, u8 *bf, u16 size)
*data = (size >> 8) & 0xff; *data = (size >> 8) & 0xff;
*(data + 1) = size & 0xff; *(data + 1) = size & 0xff;
data += 2; data += 2;
if (size > if (size > WL3501_BLKSZ - sizeof(struct wl3501_rx_hdr) + 6) {
WL3501_BLKSZ - sizeof(struct wl3501_rx_hdr) + 6) {
wl3501_get_from_wla(this, wl3501_get_from_wla(this,
this->start_seg + offset_addr4, this->start_seg + offset_addr4,
data, data,
...@@ -761,29 +746,29 @@ static void wl3501_esbq_confirm_done(struct wl3501_card *this) ...@@ -761,29 +746,29 @@ static void wl3501_esbq_confirm_done(struct wl3501_card *this)
static int wl3501_mgmt_auth(struct wl3501_card *this) static int wl3501_mgmt_auth(struct wl3501_card *this)
{ {
struct wl3501_auth_req signal; struct wl3501_auth_req sig = {
.sig_id = WL3501_SIG_AUTH_REQ,
.type = WL3501_SYS_TYPE_OPEN,
.timeout = 1000,
};
dprintk(3, "entry"); dprintk(3, "entry");
signal.next_blk = 0; memcpy(sig.mac_addr, this->bssid, ETH_ALEN);
signal.sig_id = WL3501_SIG_AUTH_REQ; return wl3501_esbq_exec(this, &sig, sizeof(sig));
signal.type = WL3501_SYS_TYPE_OPEN;
signal.timeout = 1000;
memcpy((char *)&(signal.mac_addr), (char *)&(this->bssid), ETH_ALEN);
return wl3501_esbq_exec(this, &signal, sizeof(signal));
} }
static int wl3501_mgmt_association(struct wl3501_card *this) static int wl3501_mgmt_association(struct wl3501_card *this)
{ {
struct wl3501_assoc_req signal; struct wl3501_assoc_req sig = {
.sig_id = WL3501_SIG_ASSOC_REQ,
.timeout = 1000,
.listen_interval = 5,
.cap_info = this->cap_info,
};
dprintk(3, "entry"); dprintk(3, "entry");
signal.next_blk = 0; memcpy(sig.mac_addr, this->bssid, ETH_ALEN);
signal.sig_id = WL3501_SIG_ASSOC_REQ; return wl3501_esbq_exec(this, &sig, sizeof(sig));
signal.timeout = 1000;
signal.listen_interval = 5;
signal.cap_info = this->cap_info;
memcpy((char *)&(signal.mac_addr), (char *)&(this->bssid), ETH_ALEN);
return wl3501_esbq_exec(this, &signal, sizeof(signal));
} }
static void wl3501_mgmt_join_confirm(struct net_device *dev, u16 addr) static void wl3501_mgmt_join_confirm(struct net_device *dev, u16 addr)
...@@ -797,23 +782,19 @@ static void wl3501_mgmt_join_confirm(struct net_device *dev, u16 addr) ...@@ -797,23 +782,19 @@ static void wl3501_mgmt_join_confirm(struct net_device *dev, u16 addr)
if (this->net_type == IW_MODE_INFRA) { if (this->net_type == IW_MODE_INFRA) {
if (this->join_sta_bss < this->bss_cnt) { if (this->join_sta_bss < this->bss_cnt) {
const int i = this->join_sta_bss; const int i = this->join_sta_bss;
memcpy((char *)&(this->bssid), memcpy(this->bssid,
(char *)&(this->bss_set[i].bssid), this->bss_set[i].bssid, ETH_ALEN);
ETH_ALEN);
this->chan = this->bss_set[i].phy_pset[2]; this->chan = this->bss_set[i].phy_pset[2];
memcpy((char *)this->keep_essid, memcpy(this->keep_essid, this->bss_set[i].ssid,
(char *)this->bss_set[i].ssid,
WL3501_ESSID_MAX_LEN); WL3501_ESSID_MAX_LEN);
wl3501_mgmt_auth(this); wl3501_mgmt_auth(this);
} }
} else { } else {
const int i = this->join_sta_bss; const int i = this->join_sta_bss;
memcpy((char *)&(this->bssid), memcpy(this->bssid, this->bss_set[i].bssid, ETH_ALEN);
(char *)&(this->bss_set[i].bssid), ETH_ALEN);
this->chan = this->bss_set[i].phy_pset[2]; this->chan = this->bss_set[i].phy_pset[2];
memcpy((char *)this->keep_essid, memcpy(this->keep_essid,
(char *)this->bss_set[i].ssid, this->bss_set[i].ssid, WL3501_ESSID_MAX_LEN);
WL3501_ESSID_MAX_LEN);
wl3501_online(dev); wl3501_online(dev);
} }
} else { } else {
...@@ -1408,17 +1389,11 @@ static int wl3501_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -1408,17 +1389,11 @@ static int wl3501_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
int rc = -ENODEV; int rc = -ENODEV;
if (!netif_device_present(dev)) if (netif_device_present(dev)) {
goto out;
switch (cmd) {
case SIOCETHTOOL:
rc = wl3501_ethtool_ioctl(dev, (void *)rq->ifr_data);
break;
default:
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
if (cmd == SIOCETHTOOL)
rc = wl3501_ethtool_ioctl(dev, (void *)rq->ifr_data);
} }
out:
return rc; return rc;
} }
...@@ -1590,10 +1565,9 @@ static int wl3501_set_wap(struct net_device *dev, struct iw_request_info *info, ...@@ -1590,10 +1565,9 @@ static int wl3501_set_wap(struct net_device *dev, struct iw_request_info *info,
goto out; goto out;
if (!memcmp(bcast, wrqu->ap_addr.sa_data, ETH_ALEN)) { if (!memcmp(bcast, wrqu->ap_addr.sa_data, ETH_ALEN)) {
/* FIXME: rescan? */ /* FIXME: rescan? */
} else { } else
memcpy(&this->bssid, wrqu->ap_addr.sa_data, ETH_ALEN); memcpy(this->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
/* FIXME: rescan? deassoc & scan? */ /* FIXME: rescan? deassoc & scan? */
}
rc = 0; rc = 0;
out: out:
return rc; return rc;
...@@ -1605,7 +1579,7 @@ static int wl3501_get_wap(struct net_device *dev, struct iw_request_info *info, ...@@ -1605,7 +1579,7 @@ static int wl3501_get_wap(struct net_device *dev, struct iw_request_info *info,
struct wl3501_card *this = (struct wl3501_card *)dev->priv; struct wl3501_card *this = (struct wl3501_card *)dev->priv;
wrqu->ap_addr.sa_family = this->ether_type; wrqu->ap_addr.sa_family = this->ether_type;
memcpy(wrqu->ap_addr.sa_data, &this->bssid, ETH_ALEN); memcpy(wrqu->ap_addr.sa_data, this->bssid, ETH_ALEN);
return 0; return 0;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7