Skip to content

L
linux
Commit b483f757 authored by Margit Schubert-While's avatar Margit Schubert-While Committed by Linus Torvalds
Browse files
Options

[PATCH] prism54: Add new private ioctls 

* oid_mgt.[c,h] : added type to oids. New functions :
  oid_cpu_to_le(), mgt_le_to_cpu() and mgt_response_to_str().

* isl_ioctl.c : use private sub-ioctls. Added a
  bunch of private sub-ioctls. Removed the le??_to_cpu and
  cpu_to_le??. Give the error code when sending wireless
  events.
parent 9c6c5143
Hide whitespace changes
Inline Side-by-side
Showing with 654 additions and 288 deletions
drivers/net/wireless/prism54/isl_ioctl.c
View file @ b483f757
/* /*
* *
* Copyright (C) 2002 Intersil Americas Inc. * Copyright (C) 2002 Intersil Americas Inc.
* (C) 2003 Aurelien Alleaume <slts@free.fr> * (C) 2003,2004 Aurelien Alleaume <slts@free.fr>
* (C) 2003 Herbert Valerio Riedel <hvr@gnu.org> * (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
* (C) 2003 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu> * (C) 2003 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
* *
...@@ -87,9 +87,9 @@ prism54_mib_mode_helper(islpci_private *priv, u32 iw_mode) ...@@ -87,9 +87,9 @@ prism54_mib_mode_helper(islpci_private *priv, u32 iw_mode)
/* For now, just catch early the Repeater and Secondary modes here */ /* For now, just catch early the Repeater and Secondary modes here */
if (iw_mode == IW_MODE_REPEAT || iw_mode == IW_MODE_SECOND) { if (iw_mode == IW_MODE_REPEAT || iw_mode == IW_MODE_SECOND) {
printk(KERN_DEBUG "%s(): Sorry, Repeater mode and Secondary mode " printk(KERN_DEBUG
"are not yet supported by this driver.\n", "%s(): Sorry, Repeater mode and Secondary mode "
__FUNCTION__); "are not yet supported by this driver.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
...@@ -143,8 +143,8 @@ prism54_mib_init(islpci_private *priv) ...@@ -143,8 +143,8 @@ prism54_mib_init(islpci_private *priv)
{ {
u32 t; u32 t;
struct obj_buffer psm_buffer = { struct obj_buffer psm_buffer = {
.size = cpu_to_le32(PSM_BUFFER_SIZE), .size = PSM_BUFFER_SIZE,
.addr = cpu_to_le32(priv->device_psm_buffer) .addr = priv->device_psm_buffer
}; };
mgt_set(priv, DOT11_OID_CHANNEL, &init_channel); mgt_set(priv, DOT11_OID_CHANNEL, &init_channel);
...@@ -285,7 +285,7 @@ prism54_commit(struct net_device *ndev, struct iw_request_info *info, ...@@ -285,7 +285,7 @@ prism54_commit(struct net_device *ndev, struct iw_request_info *info,
/* Commit in Monitor mode is not necessary, also setting essid /* Commit in Monitor mode is not necessary, also setting essid
* in Monitor mode does not make sense and isn't allowed for this * in Monitor mode does not make sense and isn't allowed for this
* device's firmware */ * device's firmware */
if(priv->iw_mode != IW_MODE_MONITOR) if (priv->iw_mode != IW_MODE_MONITOR)
return mgt_set_request(priv, DOT11_OID_SSID, 0, NULL); return mgt_set_request(priv, DOT11_OID_SSID, 0, NULL);
return 0; return 0;
} }
...@@ -531,20 +531,20 @@ prism54_get_range(struct net_device *ndev, struct iw_request_info *info, ...@@ -531,20 +531,20 @@ prism54_get_range(struct net_device *ndev, struct iw_request_info *info,
mgt_get_request(priv, DOT11_OID_SUPPORTEDFREQUENCIES, 0, NULL, &r); mgt_get_request(priv, DOT11_OID_SUPPORTEDFREQUENCIES, 0, NULL, &r);
freq = r.ptr; freq = r.ptr;
range->num_channels = le16_to_cpu(freq->nr); range->num_channels = freq->nr;
range->num_frequency = le16_to_cpu(freq->nr); range->num_frequency = freq->nr;
/* Frequencies are not listed in the right order. The reordering is probably /* Frequencies are not listed in the right order. The reordering is probably
* firmware dependant and thus should work for everyone. * firmware dependant and thus should work for everyone.
*/ */
m = min(IW_MAX_FREQUENCIES, (int) le16_to_cpu(freq->nr)); m = min(IW_MAX_FREQUENCIES, (int) freq->nr);
for (i = 0; i < m - 12; i++) { for (i = 0; i < m - 12; i++) {
range->freq[i].m = le16_to_cpu(freq->mhz[12 + i]); range->freq[i].m = freq->mhz[12 + i];
range->freq[i].e = 6; range->freq[i].e = 6;
range->freq[i].i = i + 1; range->freq[i].i = i + 1;
} }
for (i = m - 12; i < m; i++) { for (i = m - 12; i < m; i++) {
range->freq[i].m = le16_to_cpu(freq->mhz[i - m + 12]); range->freq[i].m = freq->mhz[i - m + 12];
range->freq[i].e = 6; range->freq[i].e = 6;
range->freq[i].i = i + 23; range->freq[i].i = i + 23;
} }
...@@ -655,7 +655,7 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev, ...@@ -655,7 +655,7 @@ prism54_translate_bss(struct net_device *ndev, char *current_ev,
#define CAP_CRYPT 0x10 #define CAP_CRYPT 0x10
/* Mode */ /* Mode */
cap = le16_to_cpu(bss->capinfo); cap = bss->capinfo;
iwe.u.mode = 0; iwe.u.mode = 0;
if (cap & CAP_ESS) if (cap & CAP_ESS)
iwe.u.mode = IW_MODE_MASTER; iwe.u.mode = IW_MODE_MASTER;
...@@ -747,7 +747,7 @@ prism54_get_scan(struct net_device *ndev, struct iw_request_info *info, ...@@ -747,7 +747,7 @@ prism54_get_scan(struct net_device *ndev, struct iw_request_info *info,
bsslist = r.ptr; bsslist = r.ptr;
/* ok now, scan the list and translate its info */ /* ok now, scan the list and translate its info */
for (i = 0; i < min(IW_MAX_AP, (int) le32_to_cpu(bsslist->nr)); i++) for (i = 0; i < min(IW_MAX_AP, (int) bsslist->nr); i++)
current_ev = prism54_translate_bss(ndev, current_ev, current_ev = prism54_translate_bss(ndev, current_ev,
extra + IW_SCAN_MAX_DATA, extra + IW_SCAN_MAX_DATA,
&(bsslist->bsslist[i]), &(bsslist->bsslist[i]),
...@@ -869,25 +869,26 @@ prism54_set_rate(struct net_device *ndev, ...@@ -869,25 +869,26 @@ prism54_set_rate(struct net_device *ndev,
return mgt_set_request(priv, DOT11_OID_PROFILES, 0, &profile); return mgt_set_request(priv, DOT11_OID_PROFILES, 0, &profile);
} }
if((ret = mgt_get_request(priv, DOT11_OID_SUPPORTEDRATES, 0, NULL, &r))) if ((ret =
mgt_get_request(priv, DOT11_OID_SUPPORTEDRATES, 0, NULL, &r)))
return ret; return ret;
rate = (u32) (vwrq->value / 500000); rate = (u32) (vwrq->value / 500000);
data = r.ptr; data = r.ptr;
i = 0; i = 0;
while(data[i]) { while (data[i]) {
if(rate && (data[i] == rate)) { if (rate && (data[i] == rate)) {
break; break;
} }
if(vwrq->value == i) { if (vwrq->value == i) {
break; break;
} }
data[i] |= 0x80; data[i] |= 0x80;
i++; i++;
} }
if(!data[i]) { if (!data[i]) {
return -EINVAL; return -EINVAL;
} }
...@@ -931,12 +932,12 @@ prism54_get_rate(struct net_device *ndev, ...@@ -931,12 +932,12 @@ prism54_get_rate(struct net_device *ndev,
union oid_res_t r; union oid_res_t r;
/* Get the current bit rate */ /* Get the current bit rate */
if((rvalue = mgt_get_request(priv, GEN_OID_LINKSTATE, 0, NULL, &r))) if ((rvalue = mgt_get_request(priv, GEN_OID_LINKSTATE, 0, NULL, &r)))
return rvalue; return rvalue;
vwrq->value = r.u * 500000; vwrq->value = r.u * 500000;
/* request the device for the enabled rates */ /* request the device for the enabled rates */
if((rvalue = mgt_get_request(priv, DOT11_OID_RATES, 0, NULL, &r))) if ((rvalue = mgt_get_request(priv, DOT11_OID_RATES, 0, NULL, &r)))
return rvalue; return rvalue;
data = r.ptr; data = r.ptr;
vwrq->fixed = (data[0] != 0) && (data[1] == 0); vwrq->fixed = (data[0] != 0) && (data[1] == 0);
...@@ -1225,7 +1226,7 @@ prism54_get_txpower(struct net_device *ndev, struct iw_request_info *info, ...@@ -1225,7 +1226,7 @@ prism54_get_txpower(struct net_device *ndev, struct iw_request_info *info,
rvalue = mgt_get_request(priv, OID_INL_OUTPUTPOWER, 0, NULL, &r); rvalue = mgt_get_request(priv, OID_INL_OUTPUTPOWER, 0, NULL, &r);
/* intersil firmware operates in 0.25 dBm (1/4 dBm) */ /* intersil firmware operates in 0.25 dBm (1/4 dBm) */
vwrq->value = (s32)r.u / 4; vwrq->value = (s32) r.u / 4;
vwrq->fixed = 1; vwrq->fixed = 1;
/* radio is not turned of /* radio is not turned of
* btw: how is possible to turn off only the radio * btw: how is possible to turn off only the radio
...@@ -1271,28 +1272,41 @@ prism54_reset(struct net_device *ndev, struct iw_request_info *info, ...@@ -1271,28 +1272,41 @@ prism54_reset(struct net_device *ndev, struct iw_request_info *info,
} }
static int static int
prism54_set_beacon(struct net_device *ndev, struct iw_request_info *info, prism54_get_oid(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) struct iw_point *dwrq, char *extra)
{ {
int rvalue = mgt_set_request((islpci_private *) netdev_priv(ndev), union oid_res_t r;
DOT11_OID_BEACONPERIOD, 0, uwrq); int rvalue;
enum oid_num_t n = dwrq->flags;
return (rvalue ? rvalue : -EINPROGRESS); rvalue = mgt_get_request((islpci_private *) ndev->priv, n, 0, NULL, &r);
dwrq->length = mgt_response_to_str(n, &r, extra);
if ((isl_oid[n].flags & OID_FLAG_TYPE) != OID_TYPE_U32)
kfree(r.ptr);
return rvalue;
} }
static int static int
prism54_get_beacon(struct net_device *ndev, struct iw_request_info *info, prism54_set_u32(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
union oid_res_t r; /*
int rvalue; u32 *i = (int *) extra;
int param = *i;
int u = *(i + 1);
*/
u32 oid = uwrq[0], u = uwrq[1];
rvalue = return mgt_set_request((islpci_private *) ndev->priv, oid, 0, &u);
mgt_get_request((islpci_private *) netdev_priv(ndev), }
DOT11_OID_BEACONPERIOD, 0, NULL, &r);
*uwrq = r.u;
return rvalue; static int
prism54_set_raw(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *dwrq, char *extra)
{
u32 oid = dwrq->flags;
return mgt_set_request((islpci_private *) ndev->priv, oid, 0, extra);
} }
void void
...@@ -1511,8 +1525,9 @@ prism54_kick_all(struct net_device *ndev, struct iw_request_info *info, ...@@ -1511,8 +1525,9 @@ prism54_kick_all(struct net_device *ndev, struct iw_request_info *info,
return -ENOMEM; return -ENOMEM;
/* Tell the card to kick every client */ /* Tell the card to kick every client */
mlme->id = cpu_to_le16(0); mlme->id = 0;
rvalue = mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme); rvalue =
mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme);
kfree(mlme); kfree(mlme);
return rvalue; return rvalue;
...@@ -1535,8 +1550,9 @@ prism54_kick_mac(struct net_device *ndev, struct iw_request_info *info, ...@@ -1535,8 +1550,9 @@ prism54_kick_mac(struct net_device *ndev, struct iw_request_info *info,
/* Tell the card to only kick the corresponding bastard */ /* Tell the card to only kick the corresponding bastard */
memcpy(mlme->address, addr->sa_data, ETH_ALEN); memcpy(mlme->address, addr->sa_data, ETH_ALEN);
mlme->id = cpu_to_le16(-1); mlme->id = -1;
rvalue = mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme); rvalue =
mgt_set_request(netdev_priv(ndev), DOT11_OID_DISASSOCIATE, 0, mlme);
kfree(mlme); kfree(mlme);
...@@ -1551,12 +1567,12 @@ format_event(islpci_private *priv, char *dest, const char *str, ...@@ -1551,12 +1567,12 @@ format_event(islpci_private *priv, char *dest, const char *str,
{ {
const u8 *a = mlme->address; const u8 *a = mlme->address;
int n = snprintf(dest, IW_CUSTOM_MAX, int n = snprintf(dest, IW_CUSTOM_MAX,
"%s %s %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X %s", "%s %s %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X %s (%2.2X)",
str, str,
((priv->iw_mode == IW_MODE_MASTER) ? "to" : "from"), ((priv->iw_mode == IW_MODE_MASTER) ? "from" : "to"),
a[0], a[1], a[2], a[3], a[4], a[5], a[0], a[1], a[2], a[3], a[4], a[5],
(error ? (mlme->code ? " : REJECTED " : " : ACCEPTED ") (error ? (mlme->code ? " : REJECTED " : " : ACCEPTED ")
: "")); : ""), mlme->code);
BUG_ON(n > IW_CUSTOM_MAX); BUG_ON(n > IW_CUSTOM_MAX);
*length = n; *length = n;
} }
...@@ -1598,14 +1614,15 @@ link_changed(struct net_device *ndev, u32 bitrate) ...@@ -1598,14 +1614,15 @@ link_changed(struct net_device *ndev, u32 bitrate)
{ {
islpci_private *priv = netdev_priv(ndev); islpci_private *priv = netdev_priv(ndev);
if (le32_to_cpu(bitrate)) { if (bitrate) {
if (priv->iw_mode == IW_MODE_INFRA) { if (priv->iw_mode == IW_MODE_INFRA) {
union iwreq_data uwrq; union iwreq_data uwrq;
prism54_get_wap(ndev, NULL, (struct sockaddr *) &uwrq, prism54_get_wap(ndev, NULL, (struct sockaddr *) &uwrq,
NULL); NULL);
wireless_send_event(ndev, SIOCGIWAP, &uwrq, NULL); wireless_send_event(ndev, SIOCGIWAP, &uwrq, NULL);
} else } else
send_simple_event(netdev_priv(ndev), "Link established"); send_simple_event(netdev_priv(ndev),
"Link established");
} else } else
send_simple_event(netdev_priv(ndev), "Link lost"); send_simple_event(netdev_priv(ndev), "Link lost");
} }
...@@ -1765,15 +1782,14 @@ prism54_process_bss_data(islpci_private *priv, u32 oid, u8 *addr, ...@@ -1765,15 +1782,14 @@ prism54_process_bss_data(islpci_private *priv, u32 oid, u8 *addr,
static void static void
handle_request(islpci_private *priv, struct obj_mlme *mlme, enum oid_num_t oid) handle_request(islpci_private *priv, struct obj_mlme *mlme, enum oid_num_t oid)
{ {
if (((le16_to_cpu(mlme->state) == DOT11_STATE_AUTHING) || if (((mlme->state == DOT11_STATE_AUTHING) ||
(le16_to_cpu(mlme->state) == DOT11_STATE_ASSOCING)) (mlme->state == DOT11_STATE_ASSOCING))
&& mgt_mlme_answer(priv)) { && mgt_mlme_answer(priv)) {
/* Someone is requesting auth and we must respond. Just send back /* Someone is requesting auth and we must respond. Just send back
* the trap with error code set accordingly. * the trap with error code set accordingly.
*/ */
mlme->code = cpu_to_le16(prism54_mac_accept(&priv->acl, mlme->code = prism54_mac_accept(&priv->acl,
mlme-> mlme->address) ? 0 : 1;
address) ? 0 : 1);
mgt_set_request(priv, oid, 0, mlme); mgt_set_request(priv, oid, 0, mlme);
} }
} }
...@@ -1797,6 +1813,13 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid, ...@@ -1797,6 +1813,13 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
* suited. We use the more flexible custom event facility. * suited. We use the more flexible custom event facility.
*/ */
/* I fear prism54_process_bss_data won't work with big endian data */
if ((oid == DOT11_OID_BEACON) || (oid == DOT11_OID_PROBE))
prism54_process_bss_data(priv, oid, mlme->address,
payload, len);
mgt_le_to_cpu(isl_oid[oid].flags & OID_FLAG_TYPE, (void *) mlme);
switch (oid) { switch (oid) {
case GEN_OID_LINKSTATE: case GEN_OID_LINKSTATE:
...@@ -1831,8 +1854,6 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid, ...@@ -1831,8 +1854,6 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
break; break;
case DOT11_OID_BEACON: case DOT11_OID_BEACON:
prism54_process_bss_data(priv, oid, mlme->address,
payload, len);
send_formatted_event(priv, send_formatted_event(priv,
"Received a beacon from an unkown AP", "Received a beacon from an unkown AP",
mlme, 0); mlme, 0);
...@@ -1840,8 +1861,6 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid, ...@@ -1840,8 +1861,6 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
case DOT11_OID_PROBE: case DOT11_OID_PROBE:
/* we received a probe from a client. */ /* we received a probe from a client. */
prism54_process_bss_data(priv, oid, mlme->address,
payload, len);
send_formatted_event(priv, "Received a probe from client", mlme, send_formatted_event(priv, "Received a probe from client", mlme,
0); 0);
break; break;
...@@ -1914,13 +1933,6 @@ prism54_set_mac_address(struct net_device *ndev, void *addr) ...@@ -1914,13 +1933,6 @@ prism54_set_mac_address(struct net_device *ndev, void *addr)
return ret; return ret;
} }
int
prism54_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
{
/* should we really support this old stuff ? */
return -EOPNOTSUPP;
}
int int
prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info, prism54_set_wpa(struct net_device *ndev, struct iw_request_info *info,
__u32 * uwrq, char *extra) __u32 * uwrq, char *extra)
...@@ -1952,7 +1964,7 @@ prism54_get_wpa(struct net_device *ndev, struct iw_request_info *info, ...@@ -1952,7 +1964,7 @@ prism54_get_wpa(struct net_device *ndev, struct iw_request_info *info,
int int
prism54_set_maxframeburst(struct net_device *ndev, struct iw_request_info *info, prism54_set_maxframeburst(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = netdev_priv(ndev); islpci_private *priv = netdev_priv(ndev);
u32 max_burst; u32 max_burst;
...@@ -1965,7 +1977,7 @@ prism54_set_maxframeburst(struct net_device *ndev, struct iw_request_info *info, ...@@ -1965,7 +1977,7 @@ prism54_set_maxframeburst(struct net_device *ndev, struct iw_request_info *info,
int int
prism54_get_maxframeburst(struct net_device *ndev, struct iw_request_info *info, prism54_get_maxframeburst(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = netdev_priv(ndev); islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
...@@ -1979,7 +1991,7 @@ prism54_get_maxframeburst(struct net_device *ndev, struct iw_request_info *info, ...@@ -1979,7 +1991,7 @@ prism54_get_maxframeburst(struct net_device *ndev, struct iw_request_info *info,
int int
prism54_set_profile(struct net_device *ndev, struct iw_request_info *info, prism54_set_profile(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = netdev_priv(ndev); islpci_private *priv = netdev_priv(ndev);
u32 profile; u32 profile;
...@@ -1992,7 +2004,7 @@ prism54_set_profile(struct net_device *ndev, struct iw_request_info *info, ...@@ -1992,7 +2004,7 @@ prism54_set_profile(struct net_device *ndev, struct iw_request_info *info,
int int
prism54_get_profile(struct net_device *ndev, struct iw_request_info *info, prism54_get_profile(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = netdev_priv(ndev); islpci_private *priv = netdev_priv(ndev);
union oid_res_t r; union oid_res_t r;
...@@ -2005,8 +2017,8 @@ prism54_get_profile(struct net_device *ndev, struct iw_request_info *info, ...@@ -2005,8 +2017,8 @@ prism54_get_profile(struct net_device *ndev, struct iw_request_info *info,
} }
int int
prism54_oid(struct net_device *ndev, struct iw_request_info *info, prism54_debug_oid(struct net_device *ndev, struct iw_request_info *info,
__u32 *uwrq, char *extra) __u32 * uwrq, char *extra)
{ {
islpci_private *priv = netdev_priv(ndev); islpci_private *priv = netdev_priv(ndev);
...@@ -2017,7 +2029,7 @@ prism54_oid(struct net_device *ndev, struct iw_request_info *info, ...@@ -2017,7 +2029,7 @@ prism54_oid(struct net_device *ndev, struct iw_request_info *info,
} }
int int
prism54_get_oid(struct net_device *ndev, struct iw_request_info *info, prism54_debug_get_oid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *data, char *extra) struct iw_point *data, char *extra)
{ {
islpci_private *priv = netdev_priv(ndev); islpci_private *priv = netdev_priv(ndev);
...@@ -2028,11 +2040,15 @@ prism54_get_oid(struct net_device *ndev, struct iw_request_info *info, ...@@ -2028,11 +2040,15 @@ prism54_get_oid(struct net_device *ndev, struct iw_request_info *info,
data->length = 0; data->length = 0;
if (islpci_get_state(priv) >= PRV_STATE_INIT) { if (islpci_get_state(priv) >= PRV_STATE_INIT) {
ret = islpci_mgt_transaction(priv->ndev, PIMFOR_OP_GET, priv->priv_oid, extra, 256, &response); ret =
islpci_mgt_transaction(priv->ndev, PIMFOR_OP_GET,
priv->priv_oid, extra, 256,
&response);
response_op = response->header->operation; response_op = response->header->operation;
printk("%s: ret: %i\n", ndev->name, ret); printk("%s: ret: %i\n", ndev->name, ret);
printk("%s: response_op: %i\n", ndev->name, response_op); printk("%s: response_op: %i\n", ndev->name, response_op);
if (ret || !response || response->header->operation == PIMFOR_OP_ERROR) { if (ret || !response
|| response->header->operation == PIMFOR_OP_ERROR) {
if (response) { if (response) {
islpci_mgt_release(response); islpci_mgt_release(response);
} }
...@@ -2051,21 +2067,26 @@ prism54_get_oid(struct net_device *ndev, struct iw_request_info *info, ...@@ -2051,21 +2067,26 @@ prism54_get_oid(struct net_device *ndev, struct iw_request_info *info,
} }
int int
prism54_set_oid(struct net_device *ndev, struct iw_request_info *info, prism54_debug_set_oid(struct net_device *ndev, struct iw_request_info *info,
struct iw_point *data, char *extra) struct iw_point *data, char *extra)
{ {
islpci_private *priv = netdev_priv(ndev); islpci_private *priv = netdev_priv(ndev);
struct islpci_mgmtframe *response = NULL; struct islpci_mgmtframe *response = NULL;
int ret = 0, response_op = PIMFOR_OP_ERROR; int ret = 0, response_op = PIMFOR_OP_ERROR;
printk("%s: set_oid 0x%08X\tlen: %d\n", ndev->name, priv->priv_oid, data->length); printk("%s: set_oid 0x%08X\tlen: %d\n", ndev->name, priv->priv_oid,
data->length);
if (islpci_get_state(priv) >= PRV_STATE_INIT) { if (islpci_get_state(priv) >= PRV_STATE_INIT) {
ret = islpci_mgt_transaction(priv->ndev, PIMFOR_OP_SET, priv->priv_oid, extra, data->length, &response); ret =
islpci_mgt_transaction(priv->ndev, PIMFOR_OP_SET,
priv->priv_oid, extra, data->length,
&response);
printk("%s: ret: %i\n", ndev->name, ret); printk("%s: ret: %i\n", ndev->name, ret);
if (!ret) { if (!ret) {
response_op = response->header->operation; response_op = response->header->operation;
printk("%s: response_op: %i\n", ndev->name, response_op); printk("%s: response_op: %i\n", ndev->name,
response_op);
islpci_mgt_release(response); islpci_mgt_release(response);
} }
if (ret || response_op == PIMFOR_OP_ERROR) { if (ret || response_op == PIMFOR_OP_ERROR) {
...@@ -2129,33 +2150,44 @@ static const iw_handler prism54_handler[] = { ...@@ -2129,33 +2150,44 @@ static const iw_handler prism54_handler[] = {
/* The low order bit identify a SET (0) or a GET (1) ioctl. */ /* The low order bit identify a SET (0) or a GET (1) ioctl. */
#define PRISM54_RESET SIOCIWFIRSTPRIV #define PRISM54_RESET SIOCIWFIRSTPRIV
#define PRISM54_GET_BEACON SIOCIWFIRSTPRIV+1 #define PRISM54_GET_POLICY SIOCIWFIRSTPRIV+1
#define PRISM54_SET_BEACON SIOCIWFIRSTPRIV+2 #define PRISM54_SET_POLICY SIOCIWFIRSTPRIV+2
#define PRISM54_GET_POLICY SIOCIWFIRSTPRIV+3 #define PRISM54_GET_MAC SIOCIWFIRSTPRIV+3
#define PRISM54_SET_POLICY SIOCIWFIRSTPRIV+4 #define PRISM54_ADD_MAC SIOCIWFIRSTPRIV+4
#define PRISM54_GET_MAC SIOCIWFIRSTPRIV+5
#define PRISM54_ADD_MAC SIOCIWFIRSTPRIV+6 #define PRISM54_DEL_MAC SIOCIWFIRSTPRIV+6
#define PRISM54_DEL_MAC SIOCIWFIRSTPRIV+8 #define PRISM54_KICK_MAC SIOCIWFIRSTPRIV+8
#define PRISM54_KICK_MAC SIOCIWFIRSTPRIV+10 #define PRISM54_KICK_ALL SIOCIWFIRSTPRIV+10
#define PRISM54_KICK_ALL SIOCIWFIRSTPRIV+12 #define PRISM54_GET_WPA SIOCIWFIRSTPRIV+11
#define PRISM54_SET_WPA SIOCIWFIRSTPRIV+12
#define PRISM54_GET_WPA SIOCIWFIRSTPRIV+13 #define PRISM54_DBG_OID SIOCIWFIRSTPRIV+14
#define PRISM54_SET_WPA SIOCIWFIRSTPRIV+14 #define PRISM54_DBG_GET_OID SIOCIWFIRSTPRIV+15
#define PRISM54_DBG_SET_OID SIOCIWFIRSTPRIV+16
#define PRISM54_OID SIOCIWFIRSTPRIV+16
#define PRISM54_GET_OID SIOCIWFIRSTPRIV+17 #define PRISM54_GET_OID SIOCIWFIRSTPRIV+17
#define PRISM54_SET_OID SIOCIWFIRSTPRIV+18 #define PRISM54_SET_OID_U32 SIOCIWFIRSTPRIV+18
#define PRISM54_SET_OID_STR SIOCIWFIRSTPRIV+20
#define PRISM54_SET_OID_ADDR SIOCIWFIRSTPRIV+22
#define IWPRIV_SET_U32(n,x) { n, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_"x }
#define IWPRIV_SET_SSID(n,x) { n, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 1, 0, "set_"x }
#define IWPRIV_SET_ADDR(n,x) { n, IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, "set_"x }
#define IWPRIV_GET(n,x) { n, 0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | PRIV_STR_SIZE, "get_"x }
#define IWPRIV_U32(n,x) IWPRIV_SET_U32(n,x), IWPRIV_GET(n,x)
#define IWPRIV_SSID(n,x) IWPRIV_SET_SSID(n,x), IWPRIV_GET(n,x)
#define IWPRIV_ADDR(n,x) IWPRIV_SET_ADDR(n,x), IWPRIV_GET(n,x)
/* Note : limited to 128 private ioctls */
static const struct iw_priv_args prism54_private_args[] = { static const struct iw_priv_args prism54_private_args[] = {
/*{ cmd, set_args, get_args, name } */ /*{ cmd, set_args, get_args, name } */
{PRISM54_RESET, 0, 0, "reset"}, {PRISM54_RESET, 0, 0, "reset"},
{PRISM54_GET_BEACON, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
"getBeaconPeriod"},
{PRISM54_SET_BEACON, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
"setBeaconPeriod"},
{PRISM54_GET_POLICY, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, {PRISM54_GET_POLICY, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
"getPolicy"}, "getPolicy"},
{PRISM54_SET_POLICY, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, {PRISM54_SET_POLICY, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
...@@ -2172,15 +2204,77 @@ static const struct iw_priv_args prism54_private_args[] = { ...@@ -2172,15 +2204,77 @@ static const struct iw_priv_args prism54_private_args[] = {
"get_wpa"}, "get_wpa"},
{PRISM54_SET_WPA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, {PRISM54_SET_WPA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
"set_wpa"}, "set_wpa"},
{PRISM54_OID, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "oid"}, {PRISM54_DBG_OID, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0,
{PRISM54_GET_OID, 0, IW_PRIV_TYPE_BYTE | 256, "get_oid"}, "dbg_oid"},
{PRISM54_SET_OID, IW_PRIV_TYPE_BYTE | 256, 0, "set_oid"}, {PRISM54_DBG_GET_OID, 0, IW_PRIV_TYPE_BYTE | 256, "dbg_get_oid"},
{PRISM54_DBG_SET_OID, IW_PRIV_TYPE_BYTE | 256, 0, "dbg_get_oid"},
/* --- sub-ioctls handlers --- */
{PRISM54_GET_OID,
0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | PRIV_STR_SIZE, ""},
{PRISM54_SET_OID_U32,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, ""},
{PRISM54_SET_OID_STR,
IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 1, 0, ""},
{PRISM54_SET_OID_ADDR,
IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0, ""},
/* --- sub-ioctls definitions --- */
IWPRIV_ADDR(GEN_OID_MACADDRESS, "addr"),
IWPRIV_GET(GEN_OID_LINKSTATE, "linkstate"),
IWPRIV_U32(DOT11_OID_BSSTYPE, "bsstype"),
IWPRIV_ADDR(DOT11_OID_BSSID, "bssid"),
IWPRIV_U32(DOT11_OID_STATE, "state"),
IWPRIV_U32(DOT11_OID_AID, "aid"),
IWPRIV_SSID(DOT11_OID_SSIDOVERRIDE, "ssidoverride"),
IWPRIV_U32(DOT11_OID_MEDIUMLIMIT, "medlimit"),
IWPRIV_U32(DOT11_OID_BEACONPERIOD, "beacon"),
IWPRIV_U32(DOT11_OID_DTIMPERIOD, "dtimperiod"),
IWPRIV_U32(DOT11_OID_AUTHENABLE, "authenable"),
IWPRIV_U32(DOT11_OID_PRIVACYINVOKED, "privinvok"),
IWPRIV_U32(DOT11_OID_EXUNENCRYPTED, "exunencrypt"),
IWPRIV_U32(DOT11_OID_REKEYTHRESHOLD, "rekeythresh"),
IWPRIV_U32(DOT11_OID_MAXTXLIFETIME, "maxtxlife"),
IWPRIV_U32(DOT11_OID_MAXRXLIFETIME, "maxrxlife"),
IWPRIV_U32(DOT11_OID_ALOFT_FIXEDRATE, "fixedrate"),
IWPRIV_U32(DOT11_OID_MAXFRAMEBURST, "frameburst"),
IWPRIV_U32(DOT11_OID_PSM, "psm"),
IWPRIV_U32(DOT11_OID_BRIDGELOCAL, "bridge"),
IWPRIV_U32(DOT11_OID_CLIENTS, "clients"),
IWPRIV_U32(DOT11_OID_CLIENTSASSOCIATED, "clientassoc"),
IWPRIV_U32(DOT11_OID_DOT1XENABLE, "dot1xenable"),
IWPRIV_U32(DOT11_OID_ANTENNARX, "rxant"),
IWPRIV_U32(DOT11_OID_ANTENNATX, "txant"),
IWPRIV_U32(DOT11_OID_ANTENNADIVERSITY, "antdivers"),
IWPRIV_U32(DOT11_OID_EDTHRESHOLD, "edthresh"),
IWPRIV_U32(DOT11_OID_PREAMBLESETTINGS, "preamble"),
IWPRIV_GET(DOT11_OID_RATES, "rates"),
IWPRIV_U32(DOT11_OID_OUTPUTPOWER, ".11outpower"),
IWPRIV_GET(DOT11_OID_SUPPORTEDRATES, "supprates"),
IWPRIV_GET(DOT11_OID_SUPPORTEDFREQUENCIES, "suppfreq"),
IWPRIV_U32(DOT11_OID_NOISEFLOOR, "noisefloor"),
IWPRIV_GET(DOT11_OID_FREQUENCYACTIVITY, "freqactivity"),
IWPRIV_U32(DOT11_OID_NONERPPROTECTION, "nonerpprotec"),
IWPRIV_U32(DOT11_OID_PROFILES, "profile"),
IWPRIV_GET(DOT11_OID_EXTENDEDRATES,"extrates"),
IWPRIV_U32(DOT11_OID_MLMEAUTOLEVEL, "mlmelevel"),
IWPRIV_GET(DOT11_OID_BSSS, "bsss"),
IWPRIV_GET(DOT11_OID_BSSLIST, "bsslist"),
IWPRIV_U32(OID_INL_MODE, "mode"),
IWPRIV_U32(OID_INL_CONFIG, "config"),
IWPRIV_U32(OID_INL_DOT11D_CONFORMANCE, ".11dconform"),
IWPRIV_GET(OID_INL_PHYCAPABILITIES, "phycapa"),
IWPRIV_U32(OID_INL_OUTPUTPOWER, "outpower"),
}; };
static const iw_handler prism54_private_handler[] = { static const iw_handler prism54_private_handler[] = {
(iw_handler) prism54_reset, (iw_handler) prism54_reset,
(iw_handler) prism54_get_beacon,
(iw_handler) prism54_set_beacon,
(iw_handler) prism54_get_policy, (iw_handler) prism54_get_policy,
(iw_handler) prism54_set_policy, (iw_handler) prism54_set_policy,
(iw_handler) prism54_get_mac, (iw_handler) prism54_get_mac,
...@@ -2194,9 +2288,16 @@ static const iw_handler prism54_private_handler[] = { ...@@ -2194,9 +2288,16 @@ static const iw_handler prism54_private_handler[] = {
(iw_handler) prism54_get_wpa, (iw_handler) prism54_get_wpa,
(iw_handler) prism54_set_wpa, (iw_handler) prism54_set_wpa,
(iw_handler) NULL, (iw_handler) NULL,
(iw_handler) prism54_oid, (iw_handler) prism54_debug_oid,
(iw_handler) prism54_debug_get_oid,
(iw_handler) prism54_debug_set_oid,
(iw_handler) prism54_get_oid, (iw_handler) prism54_get_oid,
(iw_handler) prism54_set_oid, (iw_handler) prism54_set_u32,
(iw_handler) NULL,
(iw_handler) prism54_set_raw,
(iw_handler) NULL,
(iw_handler) prism54_set_raw,
}; };
const struct iw_handler_def prism54_handler_def = { const struct iw_handler_def prism54_handler_def = {
...@@ -2209,3 +2310,18 @@ const struct iw_handler_def prism54_handler_def = { ...@@ -2209,3 +2310,18 @@ const struct iw_handler_def prism54_handler_def = {
.private_args = (struct iw_priv_args *) prism54_private_args, .private_args = (struct iw_priv_args *) prism54_private_args,
}; };
/* These ioctls won't work with the new API */
int
prism54_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
{
/*struct iwreq *wrq = (struct iwreq *) rq;
islpci_private *priv = netdev_priv(ndev);
int ret = 0;
switch (cmd) {
}
*/
return -EOPNOTSUPP;
}
drivers/net/wireless/prism54/isl_oid.h
View file @ b483f757
...@@ -458,16 +458,29 @@ enum oid_num_t { ...@@ -458,16 +458,29 @@ enum oid_num_t {
OID_NUM_LAST OID_NUM_LAST
}; };
/* We could add more flags. eg: in which mode are they allowed, ro, rw, ...*/ #define OID_FLAG_CACHED 0x80
#define OID_FLAG_CACHED 0x01 #define OID_FLAG_TYPE 0x7f
#define OID_FLAG_U32 0x02
#define OID_FLAG_MLMEEX 0x04 /* this type is special because of a variable #define OID_TYPE_U32 0x01
size field when sending. Not yet implemented (not used in driver). */ #define OID_TYPE_SSID 0x02
#define OID_TYPE_KEY 0x03
#define OID_TYPE_BUFFER 0x04
#define OID_TYPE_BSS 0x05
#define OID_TYPE_BSSLIST 0x06
#define OID_TYPE_FREQUENCIES 0x07
#define OID_TYPE_MLME 0x08
#define OID_TYPE_MLMEEX 0x09
#define OID_TYPE_ADDR 0x0A
#define OID_TYPE_RAW 0x0B
/* OID_TYPE_MLMEEX is special because of a variable size field when sending.
* Not yet implemented (not used in driver anyway).
*/
struct oid_t { struct oid_t {
enum oid_num_t oid; enum oid_num_t oid;
short range; /* to define a range of oid */ short range; /* to define a range of oid */
short size; /* size of the associated data */ short size; /* max size of the associated data */
char flags; char flags;
}; };
...@@ -479,6 +492,7 @@ union oid_res_t { ...@@ -479,6 +492,7 @@ union oid_res_t {
#define IWMAX_BITRATES 20 #define IWMAX_BITRATES 20
#define IWMAX_BSS 24 #define IWMAX_BSS 24
#define IWMAX_FREQ 30 #define IWMAX_FREQ 30
#define PRIV_STR_SIZE 1024
#endif /* !defined(_ISL_OID_H) */ #endif /* !defined(_ISL_OID_H) */
/* EOF */ /* EOF */
drivers/net/wireless/prism54/oid_mgt.c
View file @ b483f757
/* /*
* Copyright (C) 2003 Aurelien Alleaume <slts@free.fr> * Copyright (C) 2003,2004 Aurelien Alleaume <slts@free.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -31,182 +31,189 @@ const int frequency_list_a[] = { 5170, 5180, 5190, 5200, 5210, 5220, 5230, ...@@ -31,182 +31,189 @@ const int frequency_list_a[] = { 5170, 5180, 5190, 5200, 5210, 5220, 5230,
5240, 5260, 5280, 5300, 5320 5240, 5260, 5280, 5300, 5320
}; };
#define OID_U32(x) {x, 0, sizeof(u32), OID_FLAG_U32} #define OID_STRUCT(name,oid,s,t) [name] = {oid, 0, sizeof(s), t}
#define OID_U32_C(x) {x, 0, sizeof(u32), OID_FLAG_U32 | OID_FLAG_CACHED} #define OID_STRUCT_C(name,oid,s,t) OID_STRUCT(name,oid,s,t | OID_FLAG_CACHED)
#define OID_STRUCT(x,s) {x, 0, sizeof(s), 0} #define OID_U32(name,oid) OID_STRUCT(name,oid,u32,OID_TYPE_U32)
#define OID_STRUCT_C(x,s) {x, 0, sizeof(s), OID_FLAG_CACHED} #define OID_U32_C(name,oid) OID_STRUCT_C(name,oid,u32,OID_TYPE_U32)
#define OID_STRUCT_MLME(x){x, 0, sizeof(struct obj_mlme), 0} #define OID_STRUCT_MLME(name,oid) OID_STRUCT(name,oid,struct obj_mlme,OID_TYPE_MLME)
#define OID_STRUCT_MLMEEX(x){x, 0, sizeof(struct obj_mlmeex), OID_FLAG_MLMEEX} #define OID_STRUCT_MLMEEX(name,oid) OID_STRUCT(name,oid,struct obj_mlmeex,OID_TYPE_MLMEEX)
#define OID_UNKNOWN(x) {x, 0, 0, 0} #define OID_UNKNOWN(name,oid) OID_STRUCT(name,oid,0,0)
struct oid_t isl_oid[] = { struct oid_t isl_oid[] = {
[GEN_OID_MACADDRESS] = OID_STRUCT(0x00000000, u8[6]), OID_STRUCT(GEN_OID_MACADDRESS, 0x00000000, u8[6], OID_TYPE_ADDR),
[GEN_OID_LINKSTATE] = OID_U32(0x00000001), OID_U32(GEN_OID_LINKSTATE, 0x00000001),
[GEN_OID_WATCHDOG] = OID_UNKNOWN(0x00000002), OID_UNKNOWN(GEN_OID_WATCHDOG, 0x00000002),
[GEN_OID_MIBOP] = OID_UNKNOWN(0x00000003), OID_UNKNOWN(GEN_OID_MIBOP, 0x00000003),
[GEN_OID_OPTIONS] = OID_UNKNOWN(0x00000004), OID_UNKNOWN(GEN_OID_OPTIONS, 0x00000004),
[GEN_OID_LEDCONFIG] = OID_UNKNOWN(0x00000005), OID_UNKNOWN(GEN_OID_LEDCONFIG, 0x00000005),
/* 802.11 */ /* 802.11 */
[DOT11_OID_BSSTYPE] = OID_U32_C(0x10000000), OID_U32_C(DOT11_OID_BSSTYPE, 0x10000000),
[DOT11_OID_BSSID] = OID_STRUCT_C(0x10000001, u8[6]), OID_STRUCT_C(DOT11_OID_BSSID, 0x10000001, u8[6], OID_TYPE_SSID),
[DOT11_OID_SSID] = OID_STRUCT_C(0x10000002, struct obj_ssid), OID_STRUCT_C(DOT11_OID_SSID, 0x10000002, struct obj_ssid,
[DOT11_OID_STATE] = OID_U32(0x10000003), OID_TYPE_SSID),
[DOT11_OID_AID] = OID_U32(0x10000004), OID_U32(DOT11_OID_STATE, 0x10000003),
[DOT11_OID_COUNTRYSTRING] = OID_STRUCT(0x10000005, u8[4]), OID_U32(DOT11_OID_AID, 0x10000004),
[DOT11_OID_SSIDOVERRIDE] = OID_STRUCT_C(0x10000006, struct obj_ssid), OID_STRUCT(DOT11_OID_COUNTRYSTRING, 0x10000005, u8[4], OID_TYPE_RAW),
OID_STRUCT_C(DOT11_OID_SSIDOVERRIDE, 0x10000006, struct obj_ssid,
[DOT11_OID_MEDIUMLIMIT] = OID_U32(0x11000000), OID_TYPE_SSID),
[DOT11_OID_BEACONPERIOD] = OID_U32_C(0x11000001),
[DOT11_OID_DTIMPERIOD] = OID_U32(0x11000002), OID_U32(DOT11_OID_MEDIUMLIMIT, 0x11000000),
[DOT11_OID_ATIMWINDOW] = OID_U32(0x11000003), OID_U32_C(DOT11_OID_BEACONPERIOD, 0x11000001),
[DOT11_OID_LISTENINTERVAL] = OID_U32(0x11000004), OID_U32(DOT11_OID_DTIMPERIOD, 0x11000002),
[DOT11_OID_CFPPERIOD] = OID_U32(0x11000005), OID_U32(DOT11_OID_ATIMWINDOW, 0x11000003),
[DOT11_OID_CFPDURATION] = OID_U32(0x11000006), OID_U32(DOT11_OID_LISTENINTERVAL, 0x11000004),
OID_U32(DOT11_OID_CFPPERIOD, 0x11000005),
[DOT11_OID_AUTHENABLE] = OID_U32_C(0x12000000), OID_U32(DOT11_OID_CFPDURATION, 0x11000006),
[DOT11_OID_PRIVACYINVOKED] = OID_U32_C(0x12000001),
[DOT11_OID_EXUNENCRYPTED] = OID_U32_C(0x12000002), OID_U32_C(DOT11_OID_AUTHENABLE, 0x12000000),
[DOT11_OID_DEFKEYID] = OID_U32_C(0x12000003), OID_U32_C(DOT11_OID_PRIVACYINVOKED, 0x12000001),
[DOT11_OID_DEFKEYX] = {0x12000004, 3, sizeof (struct obj_key), OID_FLAG_CACHED}, /* DOT11_OID_DEFKEY1,...DOT11_OID_DEFKEY4 */ OID_U32_C(DOT11_OID_EXUNENCRYPTED, 0x12000002),
[DOT11_OID_STAKEY] = OID_UNKNOWN(0x12000008), OID_U32_C(DOT11_OID_DEFKEYID, 0x12000003),
[DOT11_OID_REKEYTHRESHOLD] = OID_U32(0x12000009), [DOT11_OID_DEFKEYX] = {0x12000004, 3, sizeof (struct obj_key),
[DOT11_OID_STASC] = OID_UNKNOWN(0x1200000a), OID_FLAG_CACHED | OID_TYPE_KEY}, /* DOT11_OID_DEFKEY1,...DOT11_OID_DEFKEY4 */
OID_UNKNOWN(DOT11_OID_STAKEY, 0x12000008),
[DOT11_OID_PRIVTXREJECTED] = OID_U32(0x1a000000), OID_U32(DOT11_OID_REKEYTHRESHOLD, 0x12000009),
[DOT11_OID_PRIVRXPLAIN] = OID_U32(0x1a000001), OID_UNKNOWN(DOT11_OID_STASC, 0x1200000a),
[DOT11_OID_PRIVRXFAILED] = OID_U32(0x1a000002),
[DOT11_OID_PRIVRXNOKEY] = OID_U32(0x1a000003), OID_U32(DOT11_OID_PRIVTXREJECTED, 0x1a000000),
OID_U32(DOT11_OID_PRIVRXPLAIN, 0x1a000001),
[DOT11_OID_RTSTHRESH] = OID_U32_C(0x13000000), OID_U32(DOT11_OID_PRIVRXFAILED, 0x1a000002),
[DOT11_OID_FRAGTHRESH] = OID_U32_C(0x13000001), OID_U32(DOT11_OID_PRIVRXNOKEY, 0x1a000003),
[DOT11_OID_SHORTRETRIES] = OID_U32_C(0x13000002),
[DOT11_OID_LONGRETRIES] = OID_U32_C(0x13000003), OID_U32_C(DOT11_OID_RTSTHRESH, 0x13000000),
[DOT11_OID_MAXTXLIFETIME] = OID_U32_C(0x13000004), OID_U32_C(DOT11_OID_FRAGTHRESH, 0x13000001),
[DOT11_OID_MAXRXLIFETIME] = OID_U32(0x13000005), OID_U32_C(DOT11_OID_SHORTRETRIES, 0x13000002),
[DOT11_OID_AUTHRESPTIMEOUT] = OID_U32(0x13000006), OID_U32_C(DOT11_OID_LONGRETRIES, 0x13000003),
[DOT11_OID_ASSOCRESPTIMEOUT] = OID_U32(0x13000007), OID_U32_C(DOT11_OID_MAXTXLIFETIME, 0x13000004),
OID_U32(DOT11_OID_MAXRXLIFETIME, 0x13000005),
[DOT11_OID_ALOFT_TABLE] = OID_UNKNOWN(0x1d000000), OID_U32(DOT11_OID_AUTHRESPTIMEOUT, 0x13000006),
[DOT11_OID_ALOFT_CTRL_TABLE] = OID_UNKNOWN(0x1d000001), OID_U32(DOT11_OID_ASSOCRESPTIMEOUT, 0x13000007),
[DOT11_OID_ALOFT_RETREAT] = OID_UNKNOWN(0x1d000002),
[DOT11_OID_ALOFT_PROGRESS] = OID_UNKNOWN(0x1d000003), OID_UNKNOWN(DOT11_OID_ALOFT_TABLE, 0x1d000000),
[DOT11_OID_ALOFT_FIXEDRATE] = OID_U32(0x1d000004), OID_UNKNOWN(DOT11_OID_ALOFT_CTRL_TABLE, 0x1d000001),
[DOT11_OID_ALOFT_RSSIGRAPH] = OID_UNKNOWN(0x1d000005), OID_UNKNOWN(DOT11_OID_ALOFT_RETREAT, 0x1d000002),
[DOT11_OID_ALOFT_CONFIG] = OID_UNKNOWN(0x1d000006), OID_UNKNOWN(DOT11_OID_ALOFT_PROGRESS, 0x1d000003),
OID_U32(DOT11_OID_ALOFT_FIXEDRATE, 0x1d000004),
OID_UNKNOWN(DOT11_OID_ALOFT_RSSIGRAPH, 0x1d000005),
OID_UNKNOWN(DOT11_OID_ALOFT_CONFIG, 0x1d000006),
[DOT11_OID_VDCFX] = {0x1b000000, 7, 0, 0}, [DOT11_OID_VDCFX] = {0x1b000000, 7, 0, 0},
[DOT11_OID_MAXFRAMEBURST] = OID_U32(0x1b000008), /* in microseconds */ OID_U32(DOT11_OID_MAXFRAMEBURST, 0x1b000008),
[DOT11_OID_PSM] = OID_U32(0x14000000), OID_U32(DOT11_OID_PSM, 0x14000000),
[DOT11_OID_CAMTIMEOUT] = OID_U32(0x14000001), OID_U32(DOT11_OID_CAMTIMEOUT, 0x14000001),
[DOT11_OID_RECEIVEDTIMS] = OID_U32(0x14000002), OID_U32(DOT11_OID_RECEIVEDTIMS, 0x14000002),
[DOT11_OID_ROAMPREFERENCE] = OID_U32(0x14000003), OID_U32(DOT11_OID_ROAMPREFERENCE, 0x14000003),
[DOT11_OID_BRIDGELOCAL] = OID_U32(0x15000000), OID_U32(DOT11_OID_BRIDGELOCAL, 0x15000000),
[DOT11_OID_CLIENTS] = OID_U32(0x15000001), OID_U32(DOT11_OID_CLIENTS, 0x15000001),
[DOT11_OID_CLIENTSASSOCIATED] = OID_U32(0x15000002), OID_U32(DOT11_OID_CLIENTSASSOCIATED, 0x15000002),
[DOT11_OID_CLIENTX] = {0x15000003, 2006, 0, 0}, /* DOT11_OID_CLIENTX,...DOT11_OID_CLIENT2007 */ [DOT11_OID_CLIENTX] = {0x15000003, 2006, 0, 0}, /* DOT11_OID_CLIENTX,...DOT11_OID_CLIENT2007 */
[DOT11_OID_CLIENTFIND] = OID_STRUCT(0x150007DB, u8[6]), OID_STRUCT(DOT11_OID_CLIENTFIND, 0x150007DB, u8[6], OID_TYPE_ADDR),
[DOT11_OID_WDSLINKADD] = OID_STRUCT(0x150007DC, u8[6]), OID_STRUCT(DOT11_OID_WDSLINKADD, 0x150007DC, u8[6], OID_TYPE_ADDR),
[DOT11_OID_WDSLINKREMOVE] = OID_STRUCT(0x150007DD, u8[6]), OID_STRUCT(DOT11_OID_WDSLINKREMOVE, 0x150007DD, u8[6], OID_TYPE_ADDR),
[DOT11_OID_EAPAUTHSTA] = OID_STRUCT(0x150007DE, u8[6]), OID_STRUCT(DOT11_OID_EAPAUTHSTA, 0x150007DE, u8[6], OID_TYPE_ADDR),
[DOT11_OID_EAPUNAUTHSTA] = OID_STRUCT(0x150007DF, u8[6]), OID_STRUCT(DOT11_OID_EAPUNAUTHSTA, 0x150007DF, u8[6], OID_TYPE_ADDR),
[DOT11_OID_DOT1XENABLE] = OID_U32_C(0x150007E0), OID_U32_C(DOT11_OID_DOT1XENABLE, 0x150007E0),
[DOT11_OID_MICFAILURE] = OID_UNKNOWN(0x150007E1), OID_UNKNOWN(DOT11_OID_MICFAILURE, 0x150007E1),
[DOT11_OID_REKEYINDICATE] = OID_UNKNOWN(0x150007E2), OID_UNKNOWN(DOT11_OID_REKEYINDICATE, 0x150007E2),
[DOT11_OID_MPDUTXSUCCESSFUL] = OID_U32(0x16000000), OID_U32(DOT11_OID_MPDUTXSUCCESSFUL, 0x16000000),
[DOT11_OID_MPDUTXONERETRY] = OID_U32(0x16000001), OID_U32(DOT11_OID_MPDUTXONERETRY, 0x16000001),
[DOT11_OID_MPDUTXMULTIPLERETRIES] = OID_U32(0x16000002), OID_U32(DOT11_OID_MPDUTXMULTIPLERETRIES, 0x16000002),
[DOT11_OID_MPDUTXFAILED] = OID_U32(0x16000003), OID_U32(DOT11_OID_MPDUTXFAILED, 0x16000003),
[DOT11_OID_MPDURXSUCCESSFUL] = OID_U32(0x16000004), OID_U32(DOT11_OID_MPDURXSUCCESSFUL, 0x16000004),
[DOT11_OID_MPDURXDUPS] = OID_U32(0x16000005), OID_U32(DOT11_OID_MPDURXDUPS, 0x16000005),
[DOT11_OID_RTSSUCCESSFUL] = OID_U32(0x16000006), OID_U32(DOT11_OID_RTSSUCCESSFUL, 0x16000006),
[DOT11_OID_RTSFAILED] = OID_U32(0x16000007), OID_U32(DOT11_OID_RTSFAILED, 0x16000007),
[DOT11_OID_ACKFAILED] = OID_U32(0x16000008), OID_U32(DOT11_OID_ACKFAILED, 0x16000008),
[DOT11_OID_FRAMERECEIVES] = OID_U32(0x16000009), OID_U32(DOT11_OID_FRAMERECEIVES, 0x16000009),
[DOT11_OID_FRAMEERRORS] = OID_U32(0x1600000A), OID_U32(DOT11_OID_FRAMEERRORS, 0x1600000A),
[DOT11_OID_FRAMEABORTS] = OID_U32(0x1600000B), OID_U32(DOT11_OID_FRAMEABORTS, 0x1600000B),
[DOT11_OID_FRAMEABORTSPHY] = OID_U32(0x1600000C), OID_U32(DOT11_OID_FRAMEABORTSPHY, 0x1600000C),
[DOT11_OID_SLOTTIME] = OID_U32(0x17000000), OID_U32(DOT11_OID_SLOTTIME, 0x17000000),
[DOT11_OID_CWMIN] = OID_U32(0x17000001), OID_U32(DOT11_OID_CWMIN, 0x17000001),
[DOT11_OID_CWMAX] = OID_U32(0x17000002), OID_U32(DOT11_OID_CWMAX, 0x17000002),
[DOT11_OID_ACKWINDOW] = OID_U32(0x17000003), OID_U32(DOT11_OID_ACKWINDOW, 0x17000003),
[DOT11_OID_ANTENNARX] = OID_U32(0x17000004), OID_U32(DOT11_OID_ANTENNARX, 0x17000004),
[DOT11_OID_ANTENNATX] = OID_U32(0x17000005), OID_U32(DOT11_OID_ANTENNATX, 0x17000005),
[DOT11_OID_ANTENNADIVERSITY] = OID_U32(0x17000006), OID_U32(DOT11_OID_ANTENNADIVERSITY, 0x17000006),
[DOT11_OID_CHANNEL] = OID_U32_C(0x17000007), OID_U32_C(DOT11_OID_CHANNEL, 0x17000007),
[DOT11_OID_EDTHRESHOLD] = OID_U32_C(0x17000008), OID_U32_C(DOT11_OID_EDTHRESHOLD, 0x17000008),
[DOT11_OID_PREAMBLESETTINGS] = OID_U32(0x17000009), OID_U32(DOT11_OID_PREAMBLESETTINGS, 0x17000009),
[DOT11_OID_RATES] = OID_STRUCT(0x1700000A, u8[IWMAX_BITRATES + 1]), OID_STRUCT(DOT11_OID_RATES, 0x1700000A, u8[IWMAX_BITRATES + 1],
[DOT11_OID_CCAMODESUPPORTED] = OID_U32(0x1700000B), OID_TYPE_RAW),
[DOT11_OID_CCAMODE] = OID_U32(0x1700000C), OID_U32(DOT11_OID_CCAMODESUPPORTED, 0x1700000B),
[DOT11_OID_RSSIVECTOR] = OID_U32(0x1700000D), OID_U32(DOT11_OID_CCAMODE, 0x1700000C),
[DOT11_OID_OUTPUTPOWERTABLE] = OID_U32(0x1700000E), OID_UNKNOWN(DOT11_OID_RSSIVECTOR, 0x1700000D),
[DOT11_OID_OUTPUTPOWER] = OID_U32_C(0x1700000F), OID_UNKNOWN(DOT11_OID_OUTPUTPOWERTABLE, 0x1700000E),
[DOT11_OID_SUPPORTEDRATES] = OID_U32(DOT11_OID_OUTPUTPOWER, 0x1700000F),
OID_STRUCT(0x17000010, u8[IWMAX_BITRATES + 1]), OID_STRUCT(DOT11_OID_SUPPORTEDRATES, 0x17000010,
[DOT11_OID_FREQUENCY] = OID_U32_C(0x17000011), u8[IWMAX_BITRATES + 1], OID_TYPE_RAW),
[DOT11_OID_SUPPORTEDFREQUENCIES] = {0x17000012, 0, sizeof (struct OID_U32_C(DOT11_OID_FREQUENCY, 0x17000011),
obj_frequencies) [DOT11_OID_SUPPORTEDFREQUENCIES] =
+ sizeof (u16) * IWMAX_FREQ, 0}, {0x17000012, 0, sizeof (struct obj_frequencies)
+ sizeof (u16) * IWMAX_FREQ, OID_TYPE_FREQUENCIES},
[DOT11_OID_NOISEFLOOR] = OID_U32(0x17000013),
[DOT11_OID_FREQUENCYACTIVITY] = OID_U32(DOT11_OID_NOISEFLOOR, 0x17000013),
OID_STRUCT(0x17000014, u8[IWMAX_FREQ + 1]), OID_STRUCT(DOT11_OID_FREQUENCYACTIVITY, 0x17000014, u8[IWMAX_FREQ + 1],
[DOT11_OID_IQCALIBRATIONTABLE] = OID_UNKNOWN(0x17000015), OID_TYPE_RAW),
[DOT11_OID_NONERPPROTECTION] = OID_U32(0x17000016), OID_UNKNOWN(DOT11_OID_IQCALIBRATIONTABLE, 0x17000015),
[DOT11_OID_SLOTSETTINGS] = OID_U32(0x17000017), OID_U32(DOT11_OID_NONERPPROTECTION, 0x17000016),
[DOT11_OID_NONERPTIMEOUT] = OID_U32(0x17000018), OID_U32(DOT11_OID_SLOTSETTINGS, 0x17000017),
[DOT11_OID_PROFILES] = OID_U32(0x17000019), OID_U32(DOT11_OID_NONERPTIMEOUT, 0x17000018),
[DOT11_OID_EXTENDEDRATES] = OID_U32(DOT11_OID_PROFILES, 0x17000019),
OID_STRUCT(0x17000020, u8[IWMAX_BITRATES + 1]), OID_STRUCT(DOT11_OID_EXTENDEDRATES, 0x17000020,
u8[IWMAX_BITRATES + 1], OID_TYPE_RAW),
[DOT11_OID_DEAUTHENTICATE] = OID_STRUCT_MLME(0x18000000),
[DOT11_OID_AUTHENTICATE] = OID_STRUCT_MLME(0x18000001), OID_STRUCT_MLME(DOT11_OID_DEAUTHENTICATE, 0x18000000),
[DOT11_OID_DISASSOCIATE] = OID_STRUCT_MLME(0x18000002), OID_STRUCT_MLME(DOT11_OID_AUTHENTICATE, 0x18000001),
[DOT11_OID_ASSOCIATE] = OID_STRUCT_MLME(0x18000003), OID_STRUCT_MLME(DOT11_OID_DISASSOCIATE, 0x18000002),
[DOT11_OID_SCAN] = OID_UNKNOWN(0x18000004), OID_STRUCT_MLME(DOT11_OID_ASSOCIATE, 0x18000003),
[DOT11_OID_BEACON] = OID_STRUCT_MLMEEX(0x18000005), OID_UNKNOWN(DOT11_OID_SCAN, 0x18000004),
[DOT11_OID_PROBE] = OID_STRUCT_MLMEEX(0x18000006), OID_STRUCT_MLMEEX(DOT11_OID_BEACON, 0x18000005),
[DOT11_OID_DEAUTHENTICATEEX] = OID_STRUCT_MLMEEX(0x18000007), OID_STRUCT_MLMEEX(DOT11_OID_PROBE, 0x18000006),
[DOT11_OID_AUTHENTICATEEX] = OID_STRUCT_MLMEEX(0x18000008), OID_STRUCT_MLMEEX(DOT11_OID_DEAUTHENTICATEEX, 0x18000007),
[DOT11_OID_DISASSOCIATEEX] = OID_STRUCT_MLMEEX(0x18000009), OID_STRUCT_MLMEEX(DOT11_OID_AUTHENTICATEEX, 0x18000008),
[DOT11_OID_ASSOCIATEEX] = OID_STRUCT_MLMEEX(0x1800000A), OID_STRUCT_MLMEEX(DOT11_OID_DISASSOCIATEEX, 0x18000009),
[DOT11_OID_REASSOCIATE] = OID_STRUCT_MLMEEX(0x1800000B), OID_STRUCT_MLMEEX(DOT11_OID_ASSOCIATEEX, 0x1800000A),
[DOT11_OID_REASSOCIATEEX] = OID_STRUCT_MLMEEX(0x1800000C), OID_STRUCT_MLMEEX(DOT11_OID_REASSOCIATE, 0x1800000B),
OID_STRUCT_MLMEEX(DOT11_OID_REASSOCIATEEX, 0x1800000C),
[DOT11_OID_NONERPSTATUS] = OID_U32(0x1E000000),
OID_U32(DOT11_OID_NONERPSTATUS, 0x1E000000),
[DOT11_OID_STATIMEOUT] = OID_U32(0x19000000),
[DOT11_OID_MLMEAUTOLEVEL] = OID_U32_C(0x19000001), OID_U32(DOT11_OID_STATIMEOUT, 0x19000000),
[DOT11_OID_BSSTIMEOUT] = OID_U32(0x19000002), OID_U32_C(DOT11_OID_MLMEAUTOLEVEL, 0x19000001),
[DOT11_OID_ATTACHMENT] = OID_UNKNOWN(0x19000003), OID_U32(DOT11_OID_BSSTIMEOUT, 0x19000002),
[DOT11_OID_PSMBUFFER] = OID_STRUCT_C(0x19000004, struct obj_buffer), OID_UNKNOWN(DOT11_OID_ATTACHMENT, 0x19000003),
OID_STRUCT_C(DOT11_OID_PSMBUFFER, 0x19000004, struct obj_buffer,
[DOT11_OID_BSSS] = OID_U32(0x1C000000), OID_TYPE_BUFFER),
[DOT11_OID_BSSX] = {0x1C000001, 63, sizeof (struct obj_bss), 0}, /*DOT11_OID_BSS1,...,DOT11_OID_BSS64 */
[DOT11_OID_BSSFIND] = OID_STRUCT(0x1C000042, struct obj_bss), OID_U32(DOT11_OID_BSSS, 0x1C000000),
[DOT11_OID_BSSX] = {0x1C000001, 63, sizeof (struct obj_bss),
OID_TYPE_BSS}, /*DOT11_OID_BSS1,...,DOT11_OID_BSS64 */
OID_STRUCT(DOT11_OID_BSSFIND, 0x1C000042, struct obj_bss, OID_TYPE_BSS),
[DOT11_OID_BSSLIST] = {0x1C000043, 0, sizeof (struct [DOT11_OID_BSSLIST] = {0x1C000043, 0, sizeof (struct
obj_bsslist) + obj_bsslist) +
sizeof (struct obj_bss[IWMAX_BSS]), 0}, sizeof (struct obj_bss[IWMAX_BSS]),
OID_TYPE_BSSLIST},
[OID_INL_TUNNEL] = OID_UNKNOWN(0xFF020000),
[OID_INL_MEMADDR] = OID_UNKNOWN(0xFF020001), OID_UNKNOWN(OID_INL_TUNNEL, 0xFF020000),
[OID_INL_MEMORY] = OID_UNKNOWN(0xFF020002), OID_UNKNOWN(OID_INL_MEMADDR, 0xFF020001),
[OID_INL_MODE] = OID_U32_C(0xFF020003), OID_UNKNOWN(OID_INL_MEMORY, 0xFF020002),
[OID_INL_COMPONENT_NR] = OID_UNKNOWN(0xFF020004), OID_U32_C(OID_INL_MODE, 0xFF020003),
[OID_INL_VERSION] = OID_UNKNOWN(0xFF020005), OID_UNKNOWN(OID_INL_COMPONENT_NR, 0xFF020004),
[OID_INL_INTERFACE_ID] = OID_UNKNOWN(0xFF020006), OID_UNKNOWN(OID_INL_VERSION, 0xFF020005),
[OID_INL_COMPONENT_ID] = OID_UNKNOWN(0xFF020007), OID_UNKNOWN(OID_INL_INTERFACE_ID, 0xFF020006),
[OID_INL_CONFIG] = OID_U32_C(0xFF020008), OID_UNKNOWN(OID_INL_COMPONENT_ID, 0xFF020007),
[OID_INL_DOT11D_CONFORMANCE] = OID_U32_C(0xFF02000C), OID_U32_C(OID_INL_CONFIG, 0xFF020008),
[OID_INL_PHYCAPABILITIES] = OID_U32(0xFF02000D), OID_U32_C(OID_INL_DOT11D_CONFORMANCE, 0xFF02000C),
[OID_INL_OUTPUTPOWER] = OID_U32_C(0xFF02000F), OID_U32(OID_INL_PHYCAPABILITIES, 0xFF02000D),
OID_U32_C(OID_INL_OUTPUTPOWER, 0xFF02000F),
}; };
...@@ -257,6 +264,134 @@ mgt_clean(islpci_private *priv) ...@@ -257,6 +264,134 @@ mgt_clean(islpci_private *priv)
priv->mib = NULL; priv->mib = NULL;
} }
void
mgt_le_to_cpu(int type, void *data)
{
switch (type) {
case OID_TYPE_U32:
*(u32 *) data = le32_to_cpu(*(u32 *) data);
break;
case OID_TYPE_BUFFER:{
struct obj_buffer *buff = data;
buff->size = le32_to_cpu(buff->size);
buff->addr = le32_to_cpu(buff->addr);
break;
}
case OID_TYPE_BSS:{
struct obj_bss *bss = data;
bss->age = le16_to_cpu(bss->age);
bss->channel = le16_to_cpu(bss->channel);
bss->capinfo = le16_to_cpu(bss->capinfo);
bss->rates = le16_to_cpu(bss->rates);
bss->basic_rates = le16_to_cpu(bss->basic_rates);
break;
}
case OID_TYPE_BSSLIST:{
struct obj_bsslist *list = data;
int i;
list->nr = le32_to_cpu(list->nr);
for (i = 0; i < list->nr; i++)
mgt_le_to_cpu(OID_TYPE_BSS, &list->bsslist[i]);
break;
}
case OID_TYPE_FREQUENCIES:{
struct obj_frequencies *freq = data;
int i;
freq->nr = le16_to_cpu(freq->nr);
for (i = 0; i < freq->nr; i++)
freq->mhz[i] = le16_to_cpu(freq->mhz[i]);
break;
}
case OID_TYPE_MLME:{
struct obj_mlme *mlme = data;
mlme->id = le16_to_cpu(mlme->id);
mlme->state = le16_to_cpu(mlme->state);
mlme->code = le16_to_cpu(mlme->code);
break;
}
case OID_TYPE_MLMEEX:{
struct obj_mlmeex *mlme = data;
mlme->id = le16_to_cpu(mlme->id);
mlme->state = le16_to_cpu(mlme->state);
mlme->code = le16_to_cpu(mlme->code);
mlme->size = le16_to_cpu(mlme->size);
break;
}
case OID_TYPE_SSID:
case OID_TYPE_KEY:
case OID_TYPE_ADDR:
case OID_TYPE_RAW:
break;
default:
BUG();
}
}
static void
mgt_cpu_to_le(int type, void *data)
{
switch (type) {
case OID_TYPE_U32:
*(u32 *) data = cpu_to_le32(*(u32 *) data);
break;
case OID_TYPE_BUFFER:{
struct obj_buffer *buff = data;
buff->size = cpu_to_le32(buff->size);
buff->addr = cpu_to_le32(buff->addr);
break;
}
case OID_TYPE_BSS:{
struct obj_bss *bss = data;
bss->age = cpu_to_le16(bss->age);
bss->channel = cpu_to_le16(bss->channel);
bss->capinfo = cpu_to_le16(bss->capinfo);
bss->rates = cpu_to_le16(bss->rates);
bss->basic_rates = cpu_to_le16(bss->basic_rates);
break;
}
case OID_TYPE_BSSLIST:{
struct obj_bsslist *list = data;
int i;
list->nr = cpu_to_le32(list->nr);
for (i = 0; i < list->nr; i++)
mgt_cpu_to_le(OID_TYPE_BSS, &list->bsslist[i]);
break;
}
case OID_TYPE_FREQUENCIES:{
struct obj_frequencies *freq = data;
int i;
freq->nr = cpu_to_le16(freq->nr);
for (i = 0; i < freq->nr; i++)
freq->mhz[i] = cpu_to_le16(freq->mhz[i]);
break;
}
case OID_TYPE_MLME:{
struct obj_mlme *mlme = data;
mlme->id = cpu_to_le16(mlme->id);
mlme->state = cpu_to_le16(mlme->state);
mlme->code = cpu_to_le16(mlme->code);
break;
}
case OID_TYPE_MLMEEX:{
struct obj_mlmeex *mlme = data;
mlme->id = cpu_to_le16(mlme->id);
mlme->state = cpu_to_le16(mlme->state);
mlme->code = cpu_to_le16(mlme->code);
mlme->size = cpu_to_le16(mlme->size);
break;
}
case OID_TYPE_SSID:
case OID_TYPE_KEY:
case OID_TYPE_ADDR:
case OID_TYPE_RAW:
break;
default:
BUG();
}
}
/* Note : data is modified during this function */
int int
mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data) mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data)
{ {
...@@ -265,7 +400,7 @@ mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data) ...@@ -265,7 +400,7 @@ mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data)
int response_op = PIMFOR_OP_ERROR; int response_op = PIMFOR_OP_ERROR;
int dlen; int dlen;
void *cache, *_data = data; void *cache, *_data = data;
u32 oid, u; u32 oid;
BUG_ON(OID_NUM_LAST <= n); BUG_ON(OID_NUM_LAST <= n);
BUG_ON(extra > isl_oid[n].range); BUG_ON(extra > isl_oid[n].range);
...@@ -279,13 +414,11 @@ mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data) ...@@ -279,13 +414,11 @@ mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data)
cache += (cache ? extra * dlen : 0); cache += (cache ? extra * dlen : 0);
oid = isl_oid[n].oid + extra; oid = isl_oid[n].oid + extra;
if (data == NULL) if (_data == NULL)
/* we are requested to re-set a cached value */ /* we are requested to re-set a cached value */
_data = cache; _data = cache;
if ((isl_oid[n].flags & OID_FLAG_U32) && data) { else
u = cpu_to_le32(*(u32 *) data); mgt_cpu_to_le(isl_oid[n].flags & OID_FLAG_TYPE, _data);
_data = &u;
}
/* If we are going to write to the cache, we don't want anyone to read /* If we are going to write to the cache, we don't want anyone to read
* it -> acquire write lock. * it -> acquire write lock.
* Else we could acquire a read lock to be sure we don't bother the * Else we could acquire a read lock to be sure we don't bother the
...@@ -313,6 +446,10 @@ mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data) ...@@ -313,6 +446,10 @@ mgt_set_request(islpci_private *priv, enum oid_num_t n, int extra, void *data)
up_write(&priv->mib_sem); up_write(&priv->mib_sem);
} }
/* re-set given data to what it was */
if (data)
mgt_le_to_cpu(isl_oid[n].flags & OID_FLAG_TYPE, data);
return ret; return ret;
} }
...@@ -326,7 +463,7 @@ mgt_get_request(islpci_private *priv, enum oid_num_t n, int extra, void *data, ...@@ -326,7 +463,7 @@ mgt_get_request(islpci_private *priv, enum oid_num_t n, int extra, void *data,
struct islpci_mgmtframe *response = NULL; struct islpci_mgmtframe *response = NULL;
int dlen; int dlen;
void *cache, *_res=NULL; void *cache, *_res = NULL;
u32 oid; u32 oid;
BUG_ON(OID_NUM_LAST <= n); BUG_ON(OID_NUM_LAST <= n);
...@@ -362,20 +499,19 @@ mgt_get_request(islpci_private *priv, enum oid_num_t n, int extra, void *data, ...@@ -362,20 +499,19 @@ mgt_get_request(islpci_private *priv, enum oid_num_t n, int extra, void *data,
_res = cache; _res = cache;
ret = 0; ret = 0;
} }
if (isl_oid[n].flags & OID_FLAG_U32) { if ((isl_oid[n].flags & OID_FLAG_TYPE) == OID_TYPE_U32)
if (ret) res->u = ret ? 0 : le32_to_cpu(*(u32 *) _res);
res->u = 0; else {
else
res->u = le32_to_cpu(*(u32 *) _res);
} else {
res->ptr = kmalloc(reslen, GFP_KERNEL); res->ptr = kmalloc(reslen, GFP_KERNEL);
BUG_ON(res->ptr == NULL); BUG_ON(res->ptr == NULL);
if (ret) if (ret)
memset(res->ptr, 0, reslen); memset(res->ptr, 0, reslen);
else else {
memcpy(res->ptr, _res, reslen); memcpy(res->ptr, _res, reslen);
mgt_le_to_cpu(isl_oid[n].flags & OID_FLAG_TYPE,
res->ptr);
}
} }
if (cache) if (cache)
up_read(&priv->mib_sem); up_read(&priv->mib_sem);
...@@ -404,7 +540,7 @@ mgt_commit_list(islpci_private *priv, enum oid_num_t *l, int n) ...@@ -404,7 +540,7 @@ mgt_commit_list(islpci_private *priv, enum oid_num_t *l, int n)
int j = 0; int j = 0;
u32 oid = t->oid; u32 oid = t->oid;
BUG_ON(data == NULL); BUG_ON(data == NULL);
while (j <= t->range){ while (j <= t->range) {
response = NULL; response = NULL;
ret |= islpci_mgt_transaction(priv->ndev, PIMFOR_OP_SET, ret |= islpci_mgt_transaction(priv->ndev, PIMFOR_OP_SET,
oid, data, t->size, oid, data, t->size,
...@@ -431,13 +567,10 @@ mgt_set(islpci_private *priv, enum oid_num_t n, void *data) ...@@ -431,13 +567,10 @@ mgt_set(islpci_private *priv, enum oid_num_t n, void *data)
BUG_ON(priv->mib[n] == NULL); BUG_ON(priv->mib[n] == NULL);
memcpy(priv->mib[n], data, isl_oid[n].size); memcpy(priv->mib[n], data, isl_oid[n].size);
if (isl_oid[n].flags & OID_FLAG_U32) mgt_cpu_to_le(isl_oid[n].flags & OID_FLAG_TYPE, priv->mib[n]);
*(u32 *) priv->mib[n] = cpu_to_le32(*(u32 *) priv->mib[n]);
} }
/* Commits the cache. If something goes wrong, it restarts the device. Lock /* Commits the cache. Lock outside. */
* outside
*/
static enum oid_num_t commit_part1[] = { static enum oid_num_t commit_part1[] = {
OID_INL_CONFIG, OID_INL_CONFIG,
...@@ -530,3 +663,102 @@ mgt_oidtonum(u32 oid) ...@@ -530,3 +663,102 @@ mgt_oidtonum(u32 oid)
return 0; return 0;
} }
int
mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str)
{
switch (isl_oid[n].flags & OID_FLAG_TYPE) {
case OID_TYPE_U32:
return snprintf(str, PRIV_STR_SIZE, "%u\n", r->u);
break;
case OID_TYPE_BUFFER:{
struct obj_buffer *buff = r->ptr;
return snprintf(str, PRIV_STR_SIZE,
"size=%u\naddr=0x%X\n", buff->size,
buff->addr);
}
break;
case OID_TYPE_BSS:{
struct obj_bss *bss = r->ptr;
return snprintf(str, PRIV_STR_SIZE,
"age=%u\nchannel=%u\n\
capinfo=0x%X\nrates=0x%X\nbasic_rates=0x%X\n", bss->age, bss->channel, bss->capinfo, bss->rates, bss->basic_rates);
}
break;
case OID_TYPE_BSSLIST:{
struct obj_bsslist *list = r->ptr;
int i, k;
k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr);
for (i = 0; i < list->nr; i++)
k += snprintf(str + k, PRIV_STR_SIZE - k,
"bss[%u] : \nage=%u\nchannel=%u\ncapinfo=0x%X\nrates=0x%X\nbasic_rates=0x%X\n",
i, list->bsslist[i].age,
list->bsslist[i].channel,
list->bsslist[i].capinfo,
list->bsslist[i].rates,
list->bsslist[i].basic_rates);
return k;
}
break;
case OID_TYPE_FREQUENCIES:{
struct obj_frequencies *freq = r->ptr;
int i, t;
printk("nr : %u\n", freq->nr);
t = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", freq->nr);
for (i = 0; i < freq->nr; i++)
t += snprintf(str + t, PRIV_STR_SIZE - t,
"mhz[%u]=%u\n", i, freq->mhz[i]);
return t;
}
break;
case OID_TYPE_MLME:{
struct obj_mlme *mlme = r->ptr;
return snprintf(str, PRIV_STR_SIZE, "id=0x%X\nstate=0x%X\n\
code=0x%X\n", mlme->id, mlme->state,
mlme->code);
}
break;
case OID_TYPE_MLMEEX:{
struct obj_mlmeex *mlme = r->ptr;
return snprintf(str, PRIV_STR_SIZE, "id=0x%X\nstate=0x%X\n\
code=0x%X\nsize=0x%X\n", mlme->id, mlme->state,
mlme->code, mlme->size);
}
break;
case OID_TYPE_SSID:{
struct obj_ssid *ssid = r->ptr;
return snprintf(str, PRIV_STR_SIZE,
"length=%u\noctets=%s\n",
ssid->length, ssid->octets);
}
break;
case OID_TYPE_KEY:{
struct obj_key *key = r->ptr;
int t, i;
t = snprintf(str, PRIV_STR_SIZE,
"type=0x%X\nlength=0x%X\nkey=0x",
key->type, key->length);
for (i = 0; i < key->length; i++)
t += snprintf(str + t, PRIV_STR_SIZE - t,
"%02X:", key->key[i]);
t += snprintf(str + t, PRIV_STR_SIZE - t, "\n");
return t;
}
break;
case OID_TYPE_RAW:
case OID_TYPE_ADDR:{
unsigned char *buff = r->ptr;
int t, i;
t = snprintf(str, PRIV_STR_SIZE, "hex data=");
for (i = 0; i < isl_oid[n].size; i++)
t += snprintf(str + t, PRIV_STR_SIZE - t,
"%02X:", buff[i]);
t += snprintf(str + t, PRIV_STR_SIZE - t, "\n");
return t;
}
break;
default:
BUG();
}
return 0;
}
drivers/net/wireless/prism54/oid_mgt.h
View file @ b483f757
...@@ -32,6 +32,8 @@ extern const int frequency_list_bg[]; ...@@ -32,6 +32,8 @@ extern const int frequency_list_bg[];
extern const int frequency_list_a[]; extern const int frequency_list_a[];
void mgt_le_to_cpu(int, void *);
int mgt_set_request(islpci_private *, enum oid_num_t, int, void *); int mgt_set_request(islpci_private *, enum oid_num_t, int, void *);
int mgt_get_request(islpci_private *, enum oid_num_t, int, void *, int mgt_get_request(islpci_private *, enum oid_num_t, int, void *,
...@@ -47,5 +49,7 @@ int mgt_mlme_answer(islpci_private *); ...@@ -47,5 +49,7 @@ int mgt_mlme_answer(islpci_private *);
enum oid_num_t mgt_oidtonum(u32 oid); enum oid_num_t mgt_oidtonum(u32 oid);
int mgt_response_to_str(enum oid_num_t, union oid_res_t *, char *);
#endif /* !defined(_OID_MGT_H) */ #endif /* !defined(_OID_MGT_H) */
/* EOF */ /* EOF */
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