Staging: wlan-ng: prism2mib.c: Coding style cleanups

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Moritz Muehlenhoff 2009-02-08 02:21:03 +01:00 committed by Greg Kroah-Hartman
parent bb12793243
commit ec7466f091

View file

@ -50,11 +50,7 @@
* -------------------------------------------------------------------- * --------------------------------------------------------------------
*/ */
/*================================================================*/
/* System Includes */
#include <linux/version.h> #include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
@ -62,15 +58,12 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <asm/io.h> #include <linux/io.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/bitops.h> #include <linux/bitops.h>
/*================================================================*/
/* Project Includes */
#include "p80211types.h" #include "p80211types.h"
#include "p80211hdr.h" #include "p80211hdr.h"
#include "p80211mgmt.h" #include "p80211mgmt.h"
@ -82,20 +75,13 @@
#include "hfa384x.h" #include "hfa384x.h"
#include "prism2mgmt.h" #include "prism2mgmt.h"
/*================================================================*/
/* Local Constants */
#define MIB_TMP_MAXLEN 200 /* Max length of RID record (in bytes). */ #define MIB_TMP_MAXLEN 200 /* Max length of RID record (in bytes). */
/*================================================================*/
/* Local Types */
#define F_STA 0x1 /* MIB is supported on stations. */ #define F_STA 0x1 /* MIB is supported on stations. */
#define F_READ 0x2 /* MIB may be read. */ #define F_READ 0x2 /* MIB may be read. */
#define F_WRITE 0x4 /* MIB may be written. */ #define F_WRITE 0x4 /* MIB may be written. */
typedef struct mibrec typedef struct mibrec {
{
u32 did; u32 did;
u16 flag; u16 flag;
u16 parm1; u16 parm1;
@ -105,79 +91,61 @@ typedef struct mibrec
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg, void *data);
void *data);
} mibrec_t; } mibrec_t;
/*================================================================*/ static int prism2mib_bytearea2pstr(mibrec_t *mib,
/* Local Function Declarations */
static int prism2mib_bytearea2pstr(
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg,
void *data); void *data);
static int prism2mib_uint32( static int prism2mib_uint32(mibrec_t *mib,
mibrec_t *mib, int isget,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data);
static int prism2mib_flag(mibrec_t *mib,
int isget,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, void *data);
static int prism2mib_wepdefaultkey(mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg,
void *data); void *data);
static int prism2mib_flag( static int prism2mib_privacyinvoked(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg,
void *data); void *data);
static int prism2mib_wepdefaultkey( static int prism2mib_excludeunencrypted(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg,
void *data); void *data);
static int prism2mib_privacyinvoked( static int prism2mib_fragmentationthreshold(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg,
void *data); void *data);
static int prism2mib_excludeunencrypted( static int prism2mib_priv(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg, void *data);
void *data);
static int prism2mib_fragmentationthreshold(
mibrec_t *mib,
int isget,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
static int prism2mib_priv(
mibrec_t *mib,
int isget,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
/*================================================================*/
/* Local Static Definitions */
static mibrec_t mibtab[] = { static mibrec_t mibtab[] = {
@ -268,10 +236,8 @@ static mibrec_t mibtab[] = {
F_STA | F_READ | F_WRITE, F_STA | F_READ | F_WRITE,
HFA384x_RID_CNFWPADATA, 0, 0, HFA384x_RID_CNFWPADATA, 0, 0,
prism2mib_priv}, prism2mib_priv},
{ 0, 0, 0, 0, 0, NULL}}; {0, 0, 0, 0, 0, NULL}
};
/*================================================================*/
/* Function Definitions */
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_mibset_mibget * prism2mgmt_mibset_mibget
@ -361,8 +327,7 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
** portion of the "mibattribute". ** portion of the "mibattribute".
*/ */
result = mib->func(mib, isget, wlandev, hw, msg, result = mib->func(mib, isget, wlandev, hw, msg, (void *)mibitem->data);
(void *) mibitem->data);
if (msg->resultcode.data == P80211ENUM_resultcode_success) { if (msg->resultcode.data == P80211ENUM_resultcode_success) {
if (result != 0) { if (result != 0) {
@ -381,7 +346,7 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
} }
done: done:
return(0); return 0;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -409,8 +374,7 @@ done:
* *
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int prism2mib_bytearea2pstr( static int prism2mib_bytearea2pstr(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
@ -422,15 +386,17 @@ void *data)
u8 bytebuf[MIB_TMP_MAXLEN]; u8 bytebuf[MIB_TMP_MAXLEN];
if (isget) { if (isget) {
result = hfa384x_drvr_getconfig(hw, mib->parm1, bytebuf, mib->parm2); result =
hfa384x_drvr_getconfig(hw, mib->parm1, bytebuf, mib->parm2);
prism2mgmt_bytearea2pstr(bytebuf, pstr, mib->parm2); prism2mgmt_bytearea2pstr(bytebuf, pstr, mib->parm2);
} else { } else {
memset(bytebuf, 0, mib->parm2); memset(bytebuf, 0, mib->parm2);
prism2mgmt_pstr2bytearea(bytebuf, pstr); prism2mgmt_pstr2bytearea(bytebuf, pstr);
result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2); result =
hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2);
} }
return(result); return result;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -458,13 +424,11 @@ void *data)
* *
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int prism2mib_uint32( static int prism2mib_uint32(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg, void *data)
void *data)
{ {
int result; int result;
u32 *uint32 = (u32 *) data; u32 *uint32 = (u32 *) data;
@ -485,7 +449,7 @@ void *data)
result = hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf); result = hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf);
} }
return(result); return result;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -513,13 +477,11 @@ void *data)
* *
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int prism2mib_flag( static int prism2mib_flag(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg, void *data)
void *data)
{ {
int result; int result;
u32 *uint32 = (u32 *) data; u32 *uint32 = (u32 *) data;
@ -545,11 +507,12 @@ void *data)
* prism2mgmt_p80211int2prism2int(wordbuf, &flags); * prism2mgmt_p80211int2prism2int(wordbuf, &flags);
*/ */
*wordbuf = flags; *wordbuf = flags;
result = hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf); result =
hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf);
} }
} }
return(result); return result;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -577,8 +540,7 @@ void *data)
* *
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int prism2mib_wepdefaultkey( static int prism2mib_wepdefaultkey(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
@ -600,7 +562,7 @@ void *data)
result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, len); result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, len);
} }
return(result); return result;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -628,8 +590,7 @@ void *data)
* *
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int prism2mib_privacyinvoked( static int prism2mib_privacyinvoked(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
@ -647,7 +608,7 @@ void *data)
result = prism2mib_flag(mib, isget, wlandev, hw, msg, data); result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);
return(result); return result;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -675,8 +636,7 @@ void *data)
* *
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int prism2mib_excludeunencrypted( static int prism2mib_excludeunencrypted(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
@ -687,7 +647,7 @@ void *data)
result = prism2mib_flag(mib, isget, wlandev, hw, msg, data); result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);
return(result); return result;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -715,8 +675,7 @@ void *data)
* *
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int prism2mib_fragmentationthreshold( static int prism2mib_fragmentationthreshold(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
@ -730,13 +689,14 @@ void *data)
if ((*uint32) % 2) { if ((*uint32) % 2) {
printk(KERN_WARNING "Attempt to set odd number " printk(KERN_WARNING "Attempt to set odd number "
"FragmentationThreshold\n"); "FragmentationThreshold\n");
msg->resultcode.data = P80211ENUM_resultcode_not_supported; msg->resultcode.data =
return(0); P80211ENUM_resultcode_not_supported;
return 0;
} }
result = prism2mib_uint32(mib, isget, wlandev, hw, msg, data); result = prism2mib_uint32(mib, isget, wlandev, hw, msg, data);
return(result); return result;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -764,13 +724,11 @@ void *data)
* *
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int prism2mib_priv( static int prism2mib_priv(mibrec_t *mib,
mibrec_t *mib,
int isget, int isget,
wlandevice_t *wlandev, wlandevice_t *wlandev,
hfa384x_t *hw, hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg, p80211msg_dot11req_mibset_t *msg, void *data)
void *data)
{ {
p80211pstrd_t *pstr = (p80211pstrd_t *) data; p80211pstrd_t *pstr = (p80211pstrd_t *) data;
@ -780,16 +738,21 @@ void *data)
case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{ case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
hfa384x_WPAData_t wpa; hfa384x_WPAData_t wpa;
if (isget) { if (isget) {
hfa384x_drvr_getconfig( hw, HFA384x_RID_CNFWPADATA, hfa384x_drvr_getconfig(hw,
(u8 *) &wpa, sizeof(wpa)); HFA384x_RID_CNFWPADATA,
(u8 *)&wpa,
sizeof(wpa));
pstr->len = hfa384x2host_16(wpa.datalen); pstr->len = hfa384x2host_16(wpa.datalen);
memcpy(pstr->data, wpa.data, pstr->len); memcpy(pstr->data, wpa.data, pstr->len);
} else { } else {
wpa.datalen = host2hfa384x_16(pstr->len); wpa.datalen = host2hfa384x_16(pstr->len);
memcpy(wpa.data, pstr->data, pstr->len); memcpy(wpa.data, pstr->data, pstr->len);
result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFWPADATA, result =
(u8 *) &wpa, sizeof(wpa)); hfa384x_drvr_setconfig(hw,
HFA384x_RID_CNFWPADATA,
(u8 *)&wpa,
sizeof(wpa));
} }
break; break;
} }
@ -797,7 +760,7 @@ void *data)
printk(KERN_ERR "Unhandled DID 0x%08x\n", mib->did); printk(KERN_ERR "Unhandled DID 0x%08x\n", mib->did);
} }
return(0); return 0;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
@ -821,7 +784,6 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
memcpy(bytestr->data, pstr->data, pstr->len); memcpy(bytestr->data, pstr->data, pstr->len);
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_pstr2bytearea * prism2mgmt_pstr2bytearea
* *
@ -842,7 +804,6 @@ void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
memcpy(bytearea, pstr->data, pstr->len); memcpy(bytearea, pstr->data, pstr->len);
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_bytestr2pstr * prism2mgmt_bytestr2pstr
* *
@ -864,7 +825,6 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
memcpy(pstr->data, bytestr->data, pstr->len); memcpy(pstr->data, bytestr->data, pstr->len);
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_bytearea2pstr * prism2mgmt_bytearea2pstr
* *
@ -886,7 +846,6 @@ void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len)
memcpy(pstr->data, bytearea, len); memcpy(pstr->data, bytearea, len);
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_prism2int2p80211int * prism2mgmt_prism2int2p80211int
* *
@ -906,7 +865,6 @@ void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint)
*wlanint = (u32) hfa384x2host_16(*prism2int); *wlanint = (u32) hfa384x2host_16(*prism2int);
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_p80211int2prism2int * prism2mgmt_p80211int2prism2int
* *
@ -926,7 +884,6 @@ void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint)
*prism2int = host2hfa384x_16((u16) (*wlanint)); *prism2int = host2hfa384x_16((u16) (*wlanint));
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_prism2enum2p80211enum * prism2mgmt_prism2enum2p80211enum
* *
@ -949,7 +906,6 @@ void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
return; return;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_p80211enum2prism2enum * prism2mgmt_p80211enum2prism2enum
* *
@ -972,8 +928,6 @@ void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
return; return;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_get_oprateset * prism2mgmt_get_oprateset
* *
@ -1028,8 +982,6 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
return; return;
} }
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_set_oprateset * prism2mgmt_set_oprateset
* *