提交 aaad4303 编写于 作者: S Solomon Peachy 提交者: Greg Kroah-Hartman

Staging: wlan-ng: Use standard kernel integer (u32/s32/etc) types.

wlan-ng needed to interact with userspace, and support very old kernels,
so it used to define its own types for integers to ensure consistency.

It's all rather irrelevant now.
Signed-off-by: NSolomon Peachy <pizza@shaftnet.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 5704976f
此差异已折叠。
...@@ -299,9 +299,9 @@ static int ...@@ -299,9 +299,9 @@ static int
hfa384x_dorrid( hfa384x_dorrid(
hfa384x_t *hw, hfa384x_t *hw,
CMD_MODE mode, CMD_MODE mode,
UINT16 rid, u16 rid,
void *riddata, void *riddata,
UINT riddatalen, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data); void *usercb_data);
...@@ -310,9 +310,9 @@ static int ...@@ -310,9 +310,9 @@ static int
hfa384x_dowrid( hfa384x_dowrid(
hfa384x_t *hw, hfa384x_t *hw,
CMD_MODE mode, CMD_MODE mode,
UINT16 rid, u16 rid,
void *riddata, void *riddata,
UINT riddatalen, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data); void *usercb_data);
...@@ -321,10 +321,10 @@ static int ...@@ -321,10 +321,10 @@ static int
hfa384x_dormem( hfa384x_dormem(
hfa384x_t *hw, hfa384x_t *hw,
CMD_MODE mode, CMD_MODE mode,
UINT16 page, u16 page,
UINT16 offset, u16 offset,
void *data, void *data,
UINT len, unsigned int len,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data); void *usercb_data);
...@@ -333,16 +333,16 @@ static int ...@@ -333,16 +333,16 @@ static int
hfa384x_dowmem( hfa384x_dowmem(
hfa384x_t *hw, hfa384x_t *hw,
CMD_MODE mode, CMD_MODE mode,
UINT16 page, u16 page,
UINT16 offset, u16 offset,
void *data, void *data,
UINT len, unsigned int len,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data); void *usercb_data);
static int static int
hfa384x_isgood_pdrcode(UINT16 pdrcode); hfa384x_isgood_pdrcode(u16 pdrcode);
/*================================================================*/ /*================================================================*/
/* Function Definitions */ /* Function Definitions */
...@@ -376,17 +376,17 @@ dbprint_urb(struct urb* urb) ...@@ -376,17 +376,17 @@ dbprint_urb(struct urb* urb)
WLAN_LOG_DEBUG(3,"urb->pipe=0x%08x\n", urb->pipe); WLAN_LOG_DEBUG(3,"urb->pipe=0x%08x\n", urb->pipe);
WLAN_LOG_DEBUG(3,"urb->status=0x%08x\n", urb->status); WLAN_LOG_DEBUG(3,"urb->status=0x%08x\n", urb->status);
WLAN_LOG_DEBUG(3,"urb->transfer_flags=0x%08x\n", urb->transfer_flags); WLAN_LOG_DEBUG(3,"urb->transfer_flags=0x%08x\n", urb->transfer_flags);
WLAN_LOG_DEBUG(3,"urb->transfer_buffer=0x%08x\n", (UINT)urb->transfer_buffer); WLAN_LOG_DEBUG(3,"urb->transfer_buffer=0x%08x\n", (unsigned int)urb->transfer_buffer);
WLAN_LOG_DEBUG(3,"urb->transfer_buffer_length=0x%08x\n", urb->transfer_buffer_length); WLAN_LOG_DEBUG(3,"urb->transfer_buffer_length=0x%08x\n", urb->transfer_buffer_length);
WLAN_LOG_DEBUG(3,"urb->actual_length=0x%08x\n", urb->actual_length); WLAN_LOG_DEBUG(3,"urb->actual_length=0x%08x\n", urb->actual_length);
WLAN_LOG_DEBUG(3,"urb->bandwidth=0x%08x\n", urb->bandwidth); WLAN_LOG_DEBUG(3,"urb->bandwidth=0x%08x\n", urb->bandwidth);
WLAN_LOG_DEBUG(3,"urb->setup_packet(ctl)=0x%08x\n", (UINT)urb->setup_packet); WLAN_LOG_DEBUG(3,"urb->setup_packet(ctl)=0x%08x\n", (unsigned int)urb->setup_packet);
WLAN_LOG_DEBUG(3,"urb->start_frame(iso/irq)=0x%08x\n", urb->start_frame); WLAN_LOG_DEBUG(3,"urb->start_frame(iso/irq)=0x%08x\n", urb->start_frame);
WLAN_LOG_DEBUG(3,"urb->interval(irq)=0x%08x\n", urb->interval); WLAN_LOG_DEBUG(3,"urb->interval(irq)=0x%08x\n", urb->interval);
WLAN_LOG_DEBUG(3,"urb->error_count(iso)=0x%08x\n", urb->error_count); WLAN_LOG_DEBUG(3,"urb->error_count(iso)=0x%08x\n", urb->error_count);
WLAN_LOG_DEBUG(3,"urb->timeout=0x%08x\n", urb->timeout); WLAN_LOG_DEBUG(3,"urb->timeout=0x%08x\n", urb->timeout);
WLAN_LOG_DEBUG(3,"urb->context=0x%08x\n", (UINT)urb->context); WLAN_LOG_DEBUG(3,"urb->context=0x%08x\n", (unsigned int)urb->context);
WLAN_LOG_DEBUG(3,"urb->complete=0x%08x\n", (UINT)urb->complete); WLAN_LOG_DEBUG(3,"urb->complete=0x%08x\n", (unsigned int)urb->complete);
} }
#endif #endif
...@@ -829,7 +829,7 @@ struct usbctlx_rrid_completor ...@@ -829,7 +829,7 @@ struct usbctlx_rrid_completor
const hfa384x_usb_rridresp_t *rridresp; const hfa384x_usb_rridresp_t *rridresp;
void *riddata; void *riddata;
UINT riddatalen; unsigned int riddatalen;
}; };
typedef struct usbctlx_rrid_completor usbctlx_rrid_completor_t; typedef struct usbctlx_rrid_completor usbctlx_rrid_completor_t;
...@@ -860,7 +860,7 @@ static inline usbctlx_completor_t* ...@@ -860,7 +860,7 @@ static inline usbctlx_completor_t*
init_rrid_completor(usbctlx_rrid_completor_t *completor, init_rrid_completor(usbctlx_rrid_completor_t *completor,
const hfa384x_usb_rridresp_t *rridresp, const hfa384x_usb_rridresp_t *rridresp,
void *riddata, void *riddata,
UINT riddatalen) unsigned int riddatalen)
{ {
completor->head.complete = usbctlx_rrid_completor_fn; completor->head.complete = usbctlx_rrid_completor_fn;
completor->rridresp = rridresp; completor->rridresp = rridresp;
...@@ -893,7 +893,7 @@ struct usbctlx_rmem_completor ...@@ -893,7 +893,7 @@ struct usbctlx_rmem_completor
const hfa384x_usb_rmemresp_t *rmemresp; const hfa384x_usb_rmemresp_t *rmemresp;
void *data; void *data;
UINT len; unsigned int len;
}; };
typedef struct usbctlx_rmem_completor usbctlx_rmem_completor_t; typedef struct usbctlx_rmem_completor usbctlx_rmem_completor_t;
...@@ -910,7 +910,7 @@ static inline usbctlx_completor_t* ...@@ -910,7 +910,7 @@ static inline usbctlx_completor_t*
init_rmem_completor(usbctlx_rmem_completor_t *completor, init_rmem_completor(usbctlx_rmem_completor_t *completor,
hfa384x_usb_rmemresp_t *rmemresp, hfa384x_usb_rmemresp_t *rmemresp,
void *data, void *data,
UINT len) unsigned int len)
{ {
completor->head.complete = usbctlx_rmem_completor_fn; completor->head.complete = usbctlx_rmem_completor_fn;
completor->rmemresp = rmemresp; completor->rmemresp = rmemresp;
...@@ -1021,7 +1021,7 @@ hfa384x_docmd_async(hfa384x_t *hw, ...@@ -1021,7 +1021,7 @@ hfa384x_docmd_async(hfa384x_t *hw,
} }
static inline int static inline int
hfa384x_dorrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen) hfa384x_dorrid_wait(hfa384x_t *hw, u16 rid, void *riddata, unsigned int riddatalen)
{ {
return hfa384x_dorrid(hw, DOWAIT, return hfa384x_dorrid(hw, DOWAIT,
rid, riddata, riddatalen, rid, riddata, riddatalen,
...@@ -1030,7 +1030,7 @@ hfa384x_dorrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen) ...@@ -1030,7 +1030,7 @@ hfa384x_dorrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)
static inline int static inline int
hfa384x_dorrid_async(hfa384x_t *hw, hfa384x_dorrid_async(hfa384x_t *hw,
UINT16 rid, void *riddata, UINT riddatalen, u16 rid, void *riddata, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
...@@ -1041,7 +1041,7 @@ hfa384x_dorrid_async(hfa384x_t *hw, ...@@ -1041,7 +1041,7 @@ hfa384x_dorrid_async(hfa384x_t *hw,
} }
static inline int static inline int
hfa384x_dowrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen) hfa384x_dowrid_wait(hfa384x_t *hw, u16 rid, void *riddata, unsigned int riddatalen)
{ {
return hfa384x_dowrid(hw, DOWAIT, return hfa384x_dowrid(hw, DOWAIT,
rid, riddata, riddatalen, rid, riddata, riddatalen,
...@@ -1050,7 +1050,7 @@ hfa384x_dowrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen) ...@@ -1050,7 +1050,7 @@ hfa384x_dowrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)
static inline int static inline int
hfa384x_dowrid_async(hfa384x_t *hw, hfa384x_dowrid_async(hfa384x_t *hw,
UINT16 rid, void *riddata, UINT riddatalen, u16 rid, void *riddata, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
...@@ -1062,7 +1062,7 @@ hfa384x_dowrid_async(hfa384x_t *hw, ...@@ -1062,7 +1062,7 @@ hfa384x_dowrid_async(hfa384x_t *hw,
static inline int static inline int
hfa384x_dormem_wait(hfa384x_t *hw, hfa384x_dormem_wait(hfa384x_t *hw,
UINT16 page, UINT16 offset, void *data, UINT len) u16 page, u16 offset, void *data, unsigned int len)
{ {
return hfa384x_dormem(hw, DOWAIT, return hfa384x_dormem(hw, DOWAIT,
page, offset, data, len, page, offset, data, len,
...@@ -1071,7 +1071,7 @@ hfa384x_dormem_wait(hfa384x_t *hw, ...@@ -1071,7 +1071,7 @@ hfa384x_dormem_wait(hfa384x_t *hw,
static inline int static inline int
hfa384x_dormem_async(hfa384x_t *hw, hfa384x_dormem_async(hfa384x_t *hw,
UINT16 page, UINT16 offset, void *data, UINT len, u16 page, u16 offset, void *data, unsigned int len,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
...@@ -1084,10 +1084,10 @@ hfa384x_dormem_async(hfa384x_t *hw, ...@@ -1084,10 +1084,10 @@ hfa384x_dormem_async(hfa384x_t *hw,
static inline int static inline int
hfa384x_dowmem_wait( hfa384x_dowmem_wait(
hfa384x_t *hw, hfa384x_t *hw,
UINT16 page, u16 page,
UINT16 offset, u16 offset,
void *data, void *data,
UINT len) unsigned int len)
{ {
return hfa384x_dowmem(hw, DOWAIT, return hfa384x_dowmem(hw, DOWAIT,
page, offset, data, len, page, offset, data, len,
...@@ -1097,10 +1097,10 @@ hfa384x_dowmem_wait( ...@@ -1097,10 +1097,10 @@ hfa384x_dowmem_wait(
static inline int static inline int
hfa384x_dowmem_async( hfa384x_dowmem_async(
hfa384x_t *hw, hfa384x_t *hw,
UINT16 page, u16 page,
UINT16 offset, u16 offset,
void *data, void *data,
UINT len, unsigned int len,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
...@@ -1187,7 +1187,7 @@ hfa384x_cmd_initialize(hfa384x_t *hw) ...@@ -1187,7 +1187,7 @@ hfa384x_cmd_initialize(hfa384x_t *hw)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport) int hfa384x_cmd_disable(hfa384x_t *hw, u16 macport)
{ {
int result = 0; int result = 0;
hfa384x_metacmd_t cmd; hfa384x_metacmd_t cmd;
...@@ -1227,7 +1227,7 @@ int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport) ...@@ -1227,7 +1227,7 @@ int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport) int hfa384x_cmd_enable(hfa384x_t *hw, u16 macport)
{ {
int result = 0; int result = 0;
hfa384x_metacmd_t cmd; hfa384x_metacmd_t cmd;
...@@ -1276,12 +1276,12 @@ int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport) ...@@ -1276,12 +1276,12 @@ int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_notify(hfa384x_t *hw, UINT16 reclaim, UINT16 fid, int hfa384x_cmd_notify(hfa384x_t *hw, u16 reclaim, u16 fid,
void *buf, UINT16 len) void *buf, u16 len)
{ {
#if 0 #if 0
int result = 0; int result = 0;
UINT16 cmd; u16 cmd;
DBFENTER; DBFENTER;
cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_NOTIFY) | cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_NOTIFY) |
HFA384x_CMD_RECL_SET(reclaim); HFA384x_CMD_RECL_SET(reclaim);
...@@ -1315,7 +1315,7 @@ return 0; ...@@ -1315,7 +1315,7 @@ return 0;
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid) int hfa384x_cmd_inquiry(hfa384x_t *hw, u16 fid)
{ {
int result = 0; int result = 0;
hfa384x_metacmd_t cmd; hfa384x_metacmd_t cmd;
...@@ -1364,7 +1364,7 @@ int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid) ...@@ -1364,7 +1364,7 @@ int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable) int hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable)
{ {
int result = 0; int result = 0;
hfa384x_metacmd_t cmd; hfa384x_metacmd_t cmd;
...@@ -1422,8 +1422,8 @@ int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable) ...@@ -1422,8 +1422,8 @@ int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr, int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr,
UINT16 highaddr, UINT16 codelen) u16 highaddr, u16 codelen)
{ {
int result = 0; int result = 0;
hfa384x_metacmd_t cmd; hfa384x_metacmd_t cmd;
...@@ -1473,7 +1473,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr, ...@@ -1473,7 +1473,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr,
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
void void
hfa384x_copy_from_aux( hfa384x_copy_from_aux(
hfa384x_t *hw, UINT32 cardaddr, UINT32 auxctl, void *buf, UINT len) hfa384x_t *hw, u32 cardaddr, u32 auxctl, void *buf, unsigned int len)
{ {
DBFENTER; DBFENTER;
WLAN_LOG_ERROR("not used in USB.\n"); WLAN_LOG_ERROR("not used in USB.\n");
...@@ -1507,7 +1507,7 @@ hfa384x_copy_from_aux( ...@@ -1507,7 +1507,7 @@ hfa384x_copy_from_aux(
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
void void
hfa384x_copy_to_aux( hfa384x_copy_to_aux(
hfa384x_t *hw, UINT32 cardaddr, UINT32 auxctl, void *buf, UINT len) hfa384x_t *hw, u32 cardaddr, u32 auxctl, void *buf, unsigned int len)
{ {
DBFENTER; DBFENTER;
WLAN_LOG_ERROR("not used in USB.\n"); WLAN_LOG_ERROR("not used in USB.\n");
...@@ -1798,9 +1798,9 @@ static int ...@@ -1798,9 +1798,9 @@ static int
hfa384x_dorrid( hfa384x_dorrid(
hfa384x_t *hw, hfa384x_t *hw,
CMD_MODE mode, CMD_MODE mode,
UINT16 rid, u16 rid,
void *riddata, void *riddata,
UINT riddatalen, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
...@@ -1884,9 +1884,9 @@ static int ...@@ -1884,9 +1884,9 @@ static int
hfa384x_dowrid( hfa384x_dowrid(
hfa384x_t *hw, hfa384x_t *hw,
CMD_MODE mode, CMD_MODE mode,
UINT16 rid, u16 rid,
void *riddata, void *riddata,
UINT riddatalen, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
...@@ -1977,10 +1977,10 @@ static int ...@@ -1977,10 +1977,10 @@ static int
hfa384x_dormem( hfa384x_dormem(
hfa384x_t *hw, hfa384x_t *hw,
CMD_MODE mode, CMD_MODE mode,
UINT16 page, u16 page,
UINT16 offset, u16 offset,
void *data, void *data,
UINT len, unsigned int len,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
...@@ -2078,10 +2078,10 @@ static int ...@@ -2078,10 +2078,10 @@ static int
hfa384x_dowmem( hfa384x_dowmem(
hfa384x_t *hw, hfa384x_t *hw,
CMD_MODE mode, CMD_MODE mode,
UINT16 page, u16 page,
UINT16 offset, u16 offset,
void *data, void *data,
UINT len, unsigned int len,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
...@@ -2198,7 +2198,7 @@ int hfa384x_drvr_commtallies( hfa384x_t *hw ) ...@@ -2198,7 +2198,7 @@ int hfa384x_drvr_commtallies( hfa384x_t *hw )
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport) int hfa384x_drvr_disable(hfa384x_t *hw, u16 macport)
{ {
int result = 0; int result = 0;
...@@ -2240,7 +2240,7 @@ int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport) ...@@ -2240,7 +2240,7 @@ int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_enable(hfa384x_t *hw, UINT16 macport) int hfa384x_drvr_enable(hfa384x_t *hw, u16 macport)
{ {
int result = 0; int result = 0;
...@@ -2393,22 +2393,22 @@ int hfa384x_drvr_flashdl_disable(hfa384x_t *hw) ...@@ -2393,22 +2393,22 @@ int hfa384x_drvr_flashdl_disable(hfa384x_t *hw)
int int
hfa384x_drvr_flashdl_write( hfa384x_drvr_flashdl_write(
hfa384x_t *hw, hfa384x_t *hw,
UINT32 daddr, u32 daddr,
void *buf, void *buf,
UINT32 len) u32 len)
{ {
int result = 0; int result = 0;
UINT32 dlbufaddr; u32 dlbufaddr;
int nburns; int nburns;
UINT32 burnlen; u32 burnlen;
UINT32 burndaddr; u32 burndaddr;
UINT16 burnlo; u16 burnlo;
UINT16 burnhi; u16 burnhi;
int nwrites; int nwrites;
UINT8 *writebuf; u8 *writebuf;
UINT16 writepage; u16 writepage;
UINT16 writeoffset; u16 writeoffset;
UINT32 writelen; u32 writelen;
int i; int i;
int j; int j;
...@@ -2559,7 +2559,7 @@ Comment out for debugging, assume the write was successful. ...@@ -2559,7 +2559,7 @@ Comment out for debugging, assume the write was successful.
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len) int hfa384x_drvr_getconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len)
{ {
int result; int result;
DBFENTER; DBFENTER;
...@@ -2600,7 +2600,7 @@ int hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len) ...@@ -2600,7 +2600,7 @@ int hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)
int int
hfa384x_drvr_getconfig_async( hfa384x_drvr_getconfig_async(
hfa384x_t *hw, hfa384x_t *hw,
UINT16 rid, u16 rid,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
{ {
...@@ -2634,9 +2634,9 @@ hfa384x_drvr_getconfig_async( ...@@ -2634,9 +2634,9 @@ hfa384x_drvr_getconfig_async(
int int
hfa384x_drvr_setconfig_async( hfa384x_drvr_setconfig_async(
hfa384x_t *hw, hfa384x_t *hw,
UINT16 rid, u16 rid,
void *buf, void *buf,
UINT16 len, u16 len,
ctlx_usercb_t usercb, ctlx_usercb_t usercb,
void *usercb_data) void *usercb_data)
{ {
...@@ -2663,7 +2663,7 @@ hfa384x_drvr_setconfig_async( ...@@ -2663,7 +2663,7 @@ hfa384x_drvr_setconfig_async(
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_handover( hfa384x_t *hw, UINT8 *addr) int hfa384x_drvr_handover( hfa384x_t *hw, u8 *addr)
{ {
DBFENTER; DBFENTER;
WLAN_LOG_ERROR("Not currently supported in USB!\n"); WLAN_LOG_ERROR("Not currently supported in USB!\n");
...@@ -2716,12 +2716,12 @@ int hfa384x_drvr_low_level(hfa384x_t *hw, hfa384x_metacmd_t *cmd) ...@@ -2716,12 +2716,12 @@ int hfa384x_drvr_low_level(hfa384x_t *hw, hfa384x_metacmd_t *cmd)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_mmi_read(hfa384x_t *hw, UINT32 addr, UINT32 *resp) int hfa384x_drvr_mmi_read(hfa384x_t *hw, u32 addr, u32 *resp)
{ {
#if 0 #if 0
int result = 0; int result = 0;
UINT16 cmd_code = (UINT16) 0x30; u16 cmd_code = (u16) 0x30;
UINT16 param = (UINT16) addr; u16 param = (u16) addr;
DBFENTER; DBFENTER;
/* Do i need a host2hfa... conversion ? */ /* Do i need a host2hfa... conversion ? */
...@@ -2756,13 +2756,13 @@ return 0; ...@@ -2756,13 +2756,13 @@ return 0;
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int int
hfa384x_drvr_mmi_write(hfa384x_t *hw, UINT32 addr, UINT32 data) hfa384x_drvr_mmi_write(hfa384x_t *hw, u32 addr, u32 data)
{ {
#if 0 #if 0
int result = 0; int result = 0;
UINT16 cmd_code = (UINT16) 0x31; u16 cmd_code = (u16) 0x31;
UINT16 param0 = (UINT16) addr; u16 param0 = (u16) addr;
UINT16 param1 = (UINT16) data; u16 param1 = (u16) data;
DBFENTER; DBFENTER;
WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08lx\n", addr); WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08lx\n", addr);
...@@ -2842,11 +2842,11 @@ hfa384x_drvr_ramdl_disable(hfa384x_t *hw) ...@@ -2842,11 +2842,11 @@ hfa384x_drvr_ramdl_disable(hfa384x_t *hw)
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int int
hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr) hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr)
{ {
int result = 0; int result = 0;
UINT16 lowaddr; u16 lowaddr;
UINT16 hiaddr; u16 hiaddr;
int i; int i;
DBFENTER; DBFENTER;
/* Check that a port isn't active */ /* Check that a port isn't active */
...@@ -2917,16 +2917,16 @@ hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr) ...@@ -2917,16 +2917,16 @@ hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr)
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int int
hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len) hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void* buf, u32 len)
{ {
int result = 0; int result = 0;
int nwrites; int nwrites;
UINT8 *data = buf; u8 *data = buf;
int i; int i;
UINT32 curraddr; u32 curraddr;
UINT16 currpage; u16 currpage;
UINT16 curroffset; u16 curroffset;
UINT16 currlen; u16 currlen;
DBFENTER; DBFENTER;
/* Check that we're in the ram download state */ /* Check that we're in the ram download state */
if ( hw->dlstate != HFA384x_DLSTATE_RAMENABLED ) { if ( hw->dlstate != HFA384x_DLSTATE_RAMENABLED ) {
...@@ -2998,21 +2998,21 @@ hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len) ...@@ -2998,21 +2998,21 @@ hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len)
* Call context: * Call context:
* process or non-card interrupt. * process or non-card interrupt.
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, unsigned int len)
{ {
int result = 0; int result = 0;
UINT16 *pda = buf; u16 *pda = buf;
int pdaok = 0; int pdaok = 0;
int morepdrs = 1; int morepdrs = 1;
int currpdr = 0; /* word offset of the current pdr */ int currpdr = 0; /* word offset of the current pdr */
size_t i; size_t i;
UINT16 pdrlen; /* pdr length in bytes, host order */ u16 pdrlen; /* pdr length in bytes, host order */
UINT16 pdrcode; /* pdr code, host order */ u16 pdrcode; /* pdr code, host order */
UINT16 currpage; u16 currpage;
UINT16 curroffset; u16 curroffset;
struct pdaloc { struct pdaloc {
UINT32 cardaddr; u32 cardaddr;
UINT16 auxctl; u16 auxctl;
} pdaloc[] = } pdaloc[] =
{ {
{ HFA3842_PDA_BASE, 0}, { HFA3842_PDA_BASE, 0},
...@@ -3116,7 +3116,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len) ...@@ -3116,7 +3116,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_setconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len) int hfa384x_drvr_setconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len)
{ {
return hfa384x_dowrid_wait(hw, rid, buf, len); return hfa384x_dowrid_wait(hw, rid, buf, len);
} }
...@@ -3734,7 +3734,7 @@ static void hfa384x_usbin_callback(struct urb *urb, struct pt_regs *regs) ...@@ -3734,7 +3734,7 @@ static void hfa384x_usbin_callback(struct urb *urb, struct pt_regs *regs)
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
int result; int result;
int urb_status; int urb_status;
UINT16 type; u16 type;
enum USBIN_ACTION { enum USBIN_ACTION {
HANDLE, HANDLE,
...@@ -3961,7 +3961,7 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin, ...@@ -3961,7 +3961,7 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin,
if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0) if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0)
run_queue = 1; run_queue = 1;
} else { } else {
const UINT16 intype = (usbin->type&~host2hfa384x_16(0x8000)); const u16 intype = (usbin->type&~host2hfa384x_16(0x8000));
/* /*
* Check that our message is what we're expecting ... * Check that our message is what we're expecting ...
...@@ -4041,7 +4041,7 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin, ...@@ -4041,7 +4041,7 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin,
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usbin_txcompl(wlandevice_t *wlandev, hfa384x_usbin_t *usbin) static void hfa384x_usbin_txcompl(wlandevice_t *wlandev, hfa384x_usbin_t *usbin)
{ {
UINT16 status; u16 status;
DBFENTER; DBFENTER;
status = hfa384x2host_16(usbin->type); /* yeah I know it says type...*/ status = hfa384x2host_16(usbin->type); /* yeah I know it says type...*/
...@@ -4081,8 +4081,8 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb) ...@@ -4081,8 +4081,8 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb)
hfa384x_t *hw = wlandev->priv; hfa384x_t *hw = wlandev->priv;
int hdrlen; int hdrlen;
p80211_rxmeta_t *rxmeta; p80211_rxmeta_t *rxmeta;
UINT16 data_len; u16 data_len;
UINT16 fc; u16 fc;
DBFENTER; DBFENTER;
...@@ -4188,12 +4188,12 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb) ...@@ -4188,12 +4188,12 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb)
static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *rxfrm) static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *rxfrm)
{ {
hfa384x_rx_frame_t *rxdesc = &(rxfrm->desc); hfa384x_rx_frame_t *rxdesc = &(rxfrm->desc);
UINT hdrlen = 0; unsigned int hdrlen = 0;
UINT datalen = 0; unsigned int datalen = 0;
UINT skblen = 0; unsigned int skblen = 0;
p80211msg_lnxind_wlansniffrm_t *msg; p80211msg_lnxind_wlansniffrm_t *msg;
UINT8 *datap; u8 *datap;
UINT16 fc; u16 fc;
struct sk_buff *skb; struct sk_buff *skb;
hfa384x_t *hw = wlandev->priv; hfa384x_t *hw = wlandev->priv;
...@@ -4842,7 +4842,7 @@ static void hfa384x_usbout_tx(wlandevice_t *wlandev, hfa384x_usbout_t *usbout) ...@@ -4842,7 +4842,7 @@ static void hfa384x_usbout_tx(wlandevice_t *wlandev, hfa384x_usbout_t *usbout)
* Call context: * Call context:
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int static int
hfa384x_isgood_pdrcode(UINT16 pdrcode) hfa384x_isgood_pdrcode(u16 pdrcode)
{ {
switch(pdrcode) { switch(pdrcode) {
case HFA384x_PDR_END_OF_PDA: case HFA384x_PDR_END_OF_PDA:
......
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
/*================================================================*/ /*================================================================*/
/* Local Static Definitions */ /* Local Static Definitions */
static UINT8 oui_rfc1042[] = {0x00, 0x00, 0x00}; static u8 oui_rfc1042[] = {0x00, 0x00, 0x00};
static UINT8 oui_8021h[] = {0x00, 0x00, 0xf8}; static u8 oui_8021h[] = {0x00, 0x00, 0xf8};
/*================================================================*/ /*================================================================*/
/* Local Function Declarations */ /* Local Function Declarations */
...@@ -134,11 +134,11 @@ static UINT8 oui_8021h[] = {0x00, 0x00, 0xf8}; ...@@ -134,11 +134,11 @@ static UINT8 oui_8021h[] = {0x00, 0x00, 0xf8};
* Call context: * Call context:
* May be called in interrupt or non-interrupt context * May be called in interrupt or non-interrupt context
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int skb_ether_to_p80211( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep) int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep)
{ {
UINT16 fc; u16 fc;
UINT16 proto; u16 proto;
wlan_ethhdr_t e_hdr; wlan_ethhdr_t e_hdr;
wlan_llc_t *e_llc; wlan_llc_t *e_llc;
wlan_snap_t *e_snap; wlan_snap_t *e_snap;
...@@ -297,14 +297,14 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac, ...@@ -297,14 +297,14 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,
* Call context: * Call context:
* May be called in interrupt or non-interrupt context * May be called in interrupt or non-interrupt context
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *skb) int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb)
{ {
netdevice_t *netdev = wlandev->netdev; netdevice_t *netdev = wlandev->netdev;
UINT16 fc; u16 fc;
UINT payload_length; unsigned int payload_length;
UINT payload_offset; unsigned int payload_offset;
UINT8 daddr[WLAN_ETHADDR_LEN]; u8 daddr[WLAN_ETHADDR_LEN];
UINT8 saddr[WLAN_ETHADDR_LEN]; u8 saddr[WLAN_ETHADDR_LEN];
p80211_hdr_t *w_hdr; p80211_hdr_t *w_hdr;
wlan_ethhdr_t *e_hdr; wlan_ethhdr_t *e_hdr;
wlan_llc_t *e_llc; wlan_llc_t *e_llc;
...@@ -488,7 +488,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * ...@@ -488,7 +488,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *
* Call context: * Call context:
* May be called in interrupt or non-interrupt context * May be called in interrupt or non-interrupt context
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int p80211_stt_findproto(UINT16 proto) int p80211_stt_findproto(u16 proto)
{ {
/* Always return found for now. This is the behavior used by the */ /* Always return found for now. This is the behavior used by the */
/* Zoom Win95 driver when 802.1h mode is selected */ /* Zoom Win95 driver when 802.1h mode is selected */
......
...@@ -86,22 +86,22 @@ typedef struct p80211_rxmeta ...@@ -86,22 +86,22 @@ typedef struct p80211_rxmeta
{ {
struct wlandevice *wlandev; struct wlandevice *wlandev;
UINT64 mactime; /* Hi-rez MAC-supplied time value */ u64 mactime; /* Hi-rez MAC-supplied time value */
UINT64 hosttime; /* Best-rez host supplied time value */ u64 hosttime; /* Best-rez host supplied time value */
UINT rxrate; /* Receive data rate in 100kbps */ unsigned int rxrate; /* Receive data rate in 100kbps */
UINT priority; /* 0-15, 0=contention, 6=CF */ unsigned int priority; /* 0-15, 0=contention, 6=CF */
INT signal; /* An SSI, see p80211netdev.h */ int signal; /* An SSI, see p80211netdev.h */
INT noise; /* An SSI, see p80211netdev.h */ int noise; /* An SSI, see p80211netdev.h */
UINT channel; /* Receive channel (mostly for snifs) */ unsigned int channel; /* Receive channel (mostly for snifs) */
UINT preamble; /* P80211ENUM_preambletype_* */ unsigned int preamble; /* P80211ENUM_preambletype_* */
UINT encoding; /* P80211ENUM_encoding_* */ unsigned int encoding; /* P80211ENUM_encoding_* */
} p80211_rxmeta_t; } p80211_rxmeta_t;
typedef struct p80211_frmmeta typedef struct p80211_frmmeta
{ {
UINT magic; unsigned int magic;
p80211_rxmeta_t *rx; p80211_rxmeta_t *rx;
} p80211_frmmeta_t; } p80211_frmmeta_t;
...@@ -117,20 +117,20 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb); ...@@ -117,20 +117,20 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb);
*/ */
typedef struct p80211_caphdr typedef struct p80211_caphdr
{ {
UINT32 version; u32 version;
UINT32 length; u32 length;
UINT64 mactime; u64 mactime;
UINT64 hosttime; u64 hosttime;
UINT32 phytype; u32 phytype;
UINT32 channel; u32 channel;
UINT32 datarate; u32 datarate;
UINT32 antenna; u32 antenna;
UINT32 priority; u32 priority;
UINT32 ssi_type; u32 ssi_type;
INT32 ssi_signal; s32 ssi_signal;
INT32 ssi_noise; s32 ssi_noise;
UINT32 preamble; u32 preamble;
UINT32 encoding; u32 encoding;
} p80211_caphdr_t; } p80211_caphdr_t;
/* buffer free method pointer type */ /* buffer free method pointer type */
...@@ -138,31 +138,31 @@ typedef void (* freebuf_method_t)(void *buf, int size); ...@@ -138,31 +138,31 @@ typedef void (* freebuf_method_t)(void *buf, int size);
typedef struct p80211_metawep { typedef struct p80211_metawep {
void *data; void *data;
UINT8 iv[4]; u8 iv[4];
UINT8 icv[4]; u8 icv[4];
} p80211_metawep_t; } p80211_metawep_t;
/* local ether header type */ /* local ether header type */
typedef struct wlan_ethhdr typedef struct wlan_ethhdr
{ {
UINT8 daddr[WLAN_ETHADDR_LEN]; u8 daddr[WLAN_ETHADDR_LEN];
UINT8 saddr[WLAN_ETHADDR_LEN]; u8 saddr[WLAN_ETHADDR_LEN];
UINT16 type; u16 type;
} __WLAN_ATTRIB_PACK__ wlan_ethhdr_t; } __WLAN_ATTRIB_PACK__ wlan_ethhdr_t;
/* local llc header type */ /* local llc header type */
typedef struct wlan_llc typedef struct wlan_llc
{ {
UINT8 dsap; u8 dsap;
UINT8 ssap; u8 ssap;
UINT8 ctl; u8 ctl;
} __WLAN_ATTRIB_PACK__ wlan_llc_t; } __WLAN_ATTRIB_PACK__ wlan_llc_t;
/* local snap header type */ /* local snap header type */
typedef struct wlan_snap typedef struct wlan_snap
{ {
UINT8 oui[WLAN_IEEE_OUI_LEN]; u8 oui[WLAN_IEEE_OUI_LEN];
UINT16 type; u16 type;
} __WLAN_ATTRIB_PACK__ wlan_snap_t; } __WLAN_ATTRIB_PACK__ wlan_snap_t;
/* Circular include trick */ /* Circular include trick */
...@@ -174,13 +174,13 @@ struct wlandevice; ...@@ -174,13 +174,13 @@ struct wlandevice;
/*================================================================*/ /*================================================================*/
/*Function Declarations */ /*Function Declarations */
int skb_p80211_to_ether( struct wlandevice *wlandev, UINT32 ethconv, int skb_p80211_to_ether( struct wlandevice *wlandev, u32 ethconv,
struct sk_buff *skb); struct sk_buff *skb);
int skb_ether_to_p80211( struct wlandevice *wlandev, UINT32 ethconv, int skb_ether_to_p80211( struct wlandevice *wlandev, u32 ethconv,
struct sk_buff *skb, p80211_hdr_t *p80211_hdr, struct sk_buff *skb, p80211_hdr_t *p80211_hdr,
p80211_metawep_t *p80211_wep ); p80211_metawep_t *p80211_wep );
int p80211_stt_findproto(UINT16 proto); int p80211_stt_findproto(u16 proto);
int p80211_stt_addproto(UINT16 proto); int p80211_stt_addproto(u16 proto);
#endif #endif
...@@ -166,29 +166,29 @@ ...@@ -166,29 +166,29 @@
/* SET_FC_FSTYPE(WLAN_FSTYPE_RTS) ); */ /* SET_FC_FSTYPE(WLAN_FSTYPE_RTS) ); */
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
#define WLAN_GET_FC_PVER(n) (((UINT16)(n)) & (BIT0 | BIT1)) #define WLAN_GET_FC_PVER(n) (((u16)(n)) & (BIT0 | BIT1))
#define WLAN_GET_FC_FTYPE(n) ((((UINT16)(n)) & (BIT2 | BIT3)) >> 2) #define WLAN_GET_FC_FTYPE(n) ((((u16)(n)) & (BIT2 | BIT3)) >> 2)
#define WLAN_GET_FC_FSTYPE(n) ((((UINT16)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4) #define WLAN_GET_FC_FSTYPE(n) ((((u16)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4)
#define WLAN_GET_FC_TODS(n) ((((UINT16)(n)) & (BIT8)) >> 8) #define WLAN_GET_FC_TODS(n) ((((u16)(n)) & (BIT8)) >> 8)
#define WLAN_GET_FC_FROMDS(n) ((((UINT16)(n)) & (BIT9)) >> 9) #define WLAN_GET_FC_FROMDS(n) ((((u16)(n)) & (BIT9)) >> 9)
#define WLAN_GET_FC_MOREFRAG(n) ((((UINT16)(n)) & (BIT10)) >> 10) #define WLAN_GET_FC_MOREFRAG(n) ((((u16)(n)) & (BIT10)) >> 10)
#define WLAN_GET_FC_RETRY(n) ((((UINT16)(n)) & (BIT11)) >> 11) #define WLAN_GET_FC_RETRY(n) ((((u16)(n)) & (BIT11)) >> 11)
#define WLAN_GET_FC_PWRMGT(n) ((((UINT16)(n)) & (BIT12)) >> 12) #define WLAN_GET_FC_PWRMGT(n) ((((u16)(n)) & (BIT12)) >> 12)
#define WLAN_GET_FC_MOREDATA(n) ((((UINT16)(n)) & (BIT13)) >> 13) #define WLAN_GET_FC_MOREDATA(n) ((((u16)(n)) & (BIT13)) >> 13)
#define WLAN_GET_FC_ISWEP(n) ((((UINT16)(n)) & (BIT14)) >> 14) #define WLAN_GET_FC_ISWEP(n) ((((u16)(n)) & (BIT14)) >> 14)
#define WLAN_GET_FC_ORDER(n) ((((UINT16)(n)) & (BIT15)) >> 15) #define WLAN_GET_FC_ORDER(n) ((((u16)(n)) & (BIT15)) >> 15)
#define WLAN_SET_FC_PVER(n) ((UINT16)(n)) #define WLAN_SET_FC_PVER(n) ((u16)(n))
#define WLAN_SET_FC_FTYPE(n) (((UINT16)(n)) << 2) #define WLAN_SET_FC_FTYPE(n) (((u16)(n)) << 2)
#define WLAN_SET_FC_FSTYPE(n) (((UINT16)(n)) << 4) #define WLAN_SET_FC_FSTYPE(n) (((u16)(n)) << 4)
#define WLAN_SET_FC_TODS(n) (((UINT16)(n)) << 8) #define WLAN_SET_FC_TODS(n) (((u16)(n)) << 8)
#define WLAN_SET_FC_FROMDS(n) (((UINT16)(n)) << 9) #define WLAN_SET_FC_FROMDS(n) (((u16)(n)) << 9)
#define WLAN_SET_FC_MOREFRAG(n) (((UINT16)(n)) << 10) #define WLAN_SET_FC_MOREFRAG(n) (((u16)(n)) << 10)
#define WLAN_SET_FC_RETRY(n) (((UINT16)(n)) << 11) #define WLAN_SET_FC_RETRY(n) (((u16)(n)) << 11)
#define WLAN_SET_FC_PWRMGT(n) (((UINT16)(n)) << 12) #define WLAN_SET_FC_PWRMGT(n) (((u16)(n)) << 12)
#define WLAN_SET_FC_MOREDATA(n) (((UINT16)(n)) << 13) #define WLAN_SET_FC_MOREDATA(n) (((u16)(n)) << 13)
#define WLAN_SET_FC_ISWEP(n) (((UINT16)(n)) << 14) #define WLAN_SET_FC_ISWEP(n) (((u16)(n)) << 14)
#define WLAN_SET_FC_ORDER(n) (((UINT16)(n)) << 15) #define WLAN_SET_FC_ORDER(n) (((u16)(n)) << 15)
/*--- Duration Macros ----------------------------------------*/ /*--- Duration Macros ----------------------------------------*/
/* Macros to get/set the bitfields of the Duration Field */ /* Macros to get/set the bitfields of the Duration Field */
...@@ -201,45 +201,45 @@ ...@@ -201,45 +201,45 @@
/* Macros to get/set the bitfields of the Sequence Control */ /* Macros to get/set the bitfields of the Sequence Control */
/* Field. */ /* Field. */
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
#define WLAN_GET_SEQ_FRGNUM(n) (((UINT16)(n)) & (BIT0|BIT1|BIT2|BIT3)) #define WLAN_GET_SEQ_FRGNUM(n) (((u16)(n)) & (BIT0|BIT1|BIT2|BIT3))
#define WLAN_GET_SEQ_SEQNUM(n) ((((UINT16)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4) #define WLAN_GET_SEQ_SEQNUM(n) ((((u16)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
/*--- Data ptr macro -----------------------------------------*/ /*--- Data ptr macro -----------------------------------------*/
/* Creates a UINT8* to the data portion of a frame */ /* Creates a u8* to the data portion of a frame */
/* Assumes you're passing in a ptr to the beginning of the hdr*/ /* Assumes you're passing in a ptr to the beginning of the hdr*/
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
#define WLAN_HDR_A3_DATAP(p) (((UINT8*)(p)) + WLAN_HDR_A3_LEN) #define WLAN_HDR_A3_DATAP(p) (((u8*)(p)) + WLAN_HDR_A3_LEN)
#define WLAN_HDR_A4_DATAP(p) (((UINT8*)(p)) + WLAN_HDR_A4_LEN) #define WLAN_HDR_A4_DATAP(p) (((u8*)(p)) + WLAN_HDR_A4_LEN)
#define DOT11_RATE5_ISBASIC_GET(r) (((UINT8)(r)) & BIT7) #define DOT11_RATE5_ISBASIC_GET(r) (((u8)(r)) & BIT7)
/*================================================================*/ /*================================================================*/
/* Types */ /* Types */
/* BSS Timestamp */ /* BSS Timestamp */
typedef UINT8 wlan_bss_ts_t[WLAN_BSS_TS_LEN]; typedef u8 wlan_bss_ts_t[WLAN_BSS_TS_LEN];
/* Generic 802.11 Header types */ /* Generic 802.11 Header types */
typedef struct p80211_hdr_a3 typedef struct p80211_hdr_a3
{ {
UINT16 fc; u16 fc;
UINT16 dur; u16 dur;
UINT8 a1[WLAN_ADDR_LEN]; u8 a1[WLAN_ADDR_LEN];
UINT8 a2[WLAN_ADDR_LEN]; u8 a2[WLAN_ADDR_LEN];
UINT8 a3[WLAN_ADDR_LEN]; u8 a3[WLAN_ADDR_LEN];
UINT16 seq; u16 seq;
} __WLAN_ATTRIB_PACK__ p80211_hdr_a3_t; } __WLAN_ATTRIB_PACK__ p80211_hdr_a3_t;
typedef struct p80211_hdr_a4 typedef struct p80211_hdr_a4
{ {
UINT16 fc; u16 fc;
UINT16 dur; u16 dur;
UINT8 a1[WLAN_ADDR_LEN]; u8 a1[WLAN_ADDR_LEN];
UINT8 a2[WLAN_ADDR_LEN]; u8 a2[WLAN_ADDR_LEN];
UINT8 a3[WLAN_ADDR_LEN]; u8 a3[WLAN_ADDR_LEN];
UINT16 seq; u16 seq;
UINT8 a4[WLAN_ADDR_LEN]; u8 a4[WLAN_ADDR_LEN];
} __WLAN_ATTRIB_PACK__ p80211_hdr_a4_t; } __WLAN_ATTRIB_PACK__ p80211_hdr_a4_t;
typedef union p80211_hdr typedef union p80211_hdr
...@@ -271,9 +271,9 @@ typedef union p80211_hdr ...@@ -271,9 +271,9 @@ typedef union p80211_hdr
#define WLAN_FCS_LEN 4 #define WLAN_FCS_LEN 4
/* ftcl in HOST order */ /* ftcl in HOST order */
inline static UINT16 p80211_headerlen(UINT16 fctl) inline static u16 p80211_headerlen(u16 fctl)
{ {
UINT16 hdrlen = 0; u16 hdrlen = 0;
switch ( WLAN_GET_FC_FTYPE(fctl) ) { switch ( WLAN_GET_FC_FTYPE(fctl) ) {
case WLAN_FTYPE_MGMT: case WLAN_FTYPE_MGMT:
......
...@@ -106,9 +106,9 @@ typedef struct p80211ioctl_req ...@@ -106,9 +106,9 @@ typedef struct p80211ioctl_req
{ {
char name[WLAN_DEVNAMELEN_MAX]; char name[WLAN_DEVNAMELEN_MAX];
caddr_t data; caddr_t data;
UINT32 magic; u32 magic;
UINT16 len; u16 len;
UINT32 result; u32 result;
} __WLAN_ATTRIB_PACK__ p80211ioctl_req_t; } __WLAN_ATTRIB_PACK__ p80211ioctl_req_t;
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
#define MKMIBMETASIZE(name) p80211meta_ ## mib ## _ ## name ## _ ## size #define MKMIBMETASIZE(name) p80211meta_ ## mib ## _ ## name ## _ ## size
#define MKGRPMETASIZE(name) p80211meta_ ## grp ## _ ## name ## _ ## size #define MKGRPMETASIZE(name) p80211meta_ ## grp ## _ ## name ## _ ## size
#define GETMETASIZE(aptr) (**((UINT32**)(aptr))) #define GETMETASIZE(aptr) (**((u32**)(aptr)))
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
/* The following ifdef depends on the following defines: */ /* The following ifdef depends on the following defines: */
...@@ -114,14 +114,14 @@ ...@@ -114,14 +114,14 @@
typedef struct p80211meta typedef struct p80211meta
{ {
char *name; /* data item name */ char *name; /* data item name */
UINT32 did; /* partial did */ u32 did; /* partial did */
UINT32 flags; /* set of various flag bits */ u32 flags; /* set of various flag bits */
UINT32 min; /* min value of a BOUNDEDINT */ u32 min; /* min value of a BOUNDEDint */
UINT32 max; /* max value of a BOUNDEDINT */ u32 max; /* max value of a BOUNDEDint */
UINT32 maxlen; /* maxlen of a OCTETSTR or DISPLAYSTR */ u32 maxlen; /* maxlen of a OCTETSTR or DISPLAYSTR */
UINT32 minlen; /* minlen of a OCTETSTR or DISPLAYSTR */ u32 minlen; /* minlen of a OCTETSTR or DISPLAYSTR */
p80211enum_t *enumptr; /* ptr to the enum type for ENUMINT */ p80211enum_t *enumptr; /* ptr to the enum type for ENUMint */
p80211_totext_t totextptr; /* ptr to totext conversion function */ p80211_totext_t totextptr; /* ptr to totext conversion function */
p80211_fromtext_t fromtextptr; /* ptr to totext conversion function */ p80211_fromtext_t fromtextptr; /* ptr to totext conversion function */
p80211_valid_t validfunptr; /* ptr to totext conversion function */ p80211_valid_t validfunptr; /* ptr to totext conversion function */
...@@ -150,20 +150,20 @@ typedef struct catlistitem ...@@ -150,20 +150,20 @@ typedef struct catlistitem
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
/* */ /* */
UINT32 p80211_text2did(catlistitem_t *catlist, char *catname, char *grpname, char *itemname); u32 p80211_text2did(catlistitem_t *catlist, char *catname, char *grpname, char *itemname);
UINT32 p80211_text2catdid(catlistitem_t *list, char *name ); u32 p80211_text2catdid(catlistitem_t *list, char *name );
UINT32 p80211_text2grpdid(grplistitem_t *list, char *name ); u32 p80211_text2grpdid(grplistitem_t *list, char *name );
UINT32 p80211_text2itemdid(p80211meta_t *list, char *name ); u32 p80211_text2itemdid(p80211meta_t *list, char *name );
UINT32 p80211_isvalid_did( catlistitem_t *catlist, UINT32 did ); u32 p80211_isvalid_did( catlistitem_t *catlist, u32 did );
UINT32 p80211_isvalid_catdid( catlistitem_t *catlist, UINT32 did ); u32 p80211_isvalid_catdid( catlistitem_t *catlist, u32 did );
UINT32 p80211_isvalid_grpdid( catlistitem_t *catlist, UINT32 did ); u32 p80211_isvalid_grpdid( catlistitem_t *catlist, u32 did );
UINT32 p80211_isvalid_itemdid( catlistitem_t *catlist, UINT32 did ); u32 p80211_isvalid_itemdid( catlistitem_t *catlist, u32 did );
catlistitem_t *p80211_did2cat( catlistitem_t *catlist, UINT32 did ); catlistitem_t *p80211_did2cat( catlistitem_t *catlist, u32 did );
grplistitem_t *p80211_did2grp( catlistitem_t *catlist, UINT32 did ); grplistitem_t *p80211_did2grp( catlistitem_t *catlist, u32 did );
p80211meta_t *p80211_did2item( catlistitem_t *catlist, UINT32 did ); p80211meta_t *p80211_did2item( catlistitem_t *catlist, u32 did );
UINT32 p80211item_maxdatalen( struct catlistitem *metalist, UINT32 did ); u32 p80211item_maxdatalen( struct catlistitem *metalist, u32 did );
UINT32 p80211_metaname2did(struct catlistitem *metalist, char *itemname); u32 p80211_metaname2did(struct catlistitem *metalist, char *itemname);
UINT32 p80211item_getoffset( struct catlistitem *metalist, UINT32 did ); u32 p80211item_getoffset( struct catlistitem *metalist, u32 did );
int p80211item_gettype(p80211meta_t *meta); int p80211item_gettype(p80211meta_t *meta);
#endif /* _P80211META_H */ #endif /* _P80211META_H */
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
/* category metadata list */ /* category metadata list */
extern catlistitem_t mib_catlist[]; extern catlistitem_t mib_catlist[];
extern UINT32 mib_catlist_size; extern u32 mib_catlist_size;
/*================================================================*/ /*================================================================*/
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
/* category metadata list */ /* category metadata list */
extern catlistitem_t msg_catlist[]; extern catlistitem_t msg_catlist[];
extern UINT32 msg_catlist_size; extern u32 msg_catlist_size;
/*================================================================*/ /*================================================================*/
......
...@@ -50,36 +50,36 @@ ...@@ -50,36 +50,36 @@
typedef struct p80211msg_dot11req_mibget typedef struct p80211msg_dot11req_mibget
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk392_t mibattribute ; p80211item_unk392_t mibattribute ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibget_t; } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibget_t;
typedef struct p80211msg_dot11req_mibset typedef struct p80211msg_dot11req_mibset
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk392_t mibattribute ; p80211item_unk392_t mibattribute ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t; } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t;
typedef struct p80211msg_dot11req_scan typedef struct p80211msg_dot11req_scan
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t bsstype ; p80211item_uint32_t bsstype ;
p80211item_pstr6_t bssid ; p80211item_pstr6_t bssid ;
UINT8 pad_0C[1] ; u8 pad_0C[1] ;
p80211item_pstr32_t ssid ; p80211item_pstr32_t ssid ;
UINT8 pad_1D[3] ; u8 pad_1D[3] ;
p80211item_uint32_t scantype ; p80211item_uint32_t scantype ;
p80211item_uint32_t probedelay ; p80211item_uint32_t probedelay ;
p80211item_pstr14_t channellist ; p80211item_pstr14_t channellist ;
UINT8 pad_2C[1] ; u8 pad_2C[1] ;
p80211item_uint32_t minchanneltime ; p80211item_uint32_t minchanneltime ;
p80211item_uint32_t maxchanneltime ; p80211item_uint32_t maxchanneltime ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
...@@ -89,17 +89,17 @@ typedef struct p80211msg_dot11req_scan ...@@ -89,17 +89,17 @@ typedef struct p80211msg_dot11req_scan
typedef struct p80211msg_dot11req_scan_results typedef struct p80211msg_dot11req_scan_results
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t bssindex ; p80211item_uint32_t bssindex ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
p80211item_uint32_t signal ; p80211item_uint32_t signal ;
p80211item_uint32_t noise ; p80211item_uint32_t noise ;
p80211item_pstr6_t bssid ; p80211item_pstr6_t bssid ;
UINT8 pad_3C[1] ; u8 pad_3C[1] ;
p80211item_pstr32_t ssid ; p80211item_pstr32_t ssid ;
UINT8 pad_4D[3] ; u8 pad_4D[3] ;
p80211item_uint32_t bsstype ; p80211item_uint32_t bsstype ;
p80211item_uint32_t beaconperiod ; p80211item_uint32_t beaconperiod ;
p80211item_uint32_t dtimperiod ; p80211item_uint32_t dtimperiod ;
...@@ -138,11 +138,11 @@ typedef struct p80211msg_dot11req_scan_results ...@@ -138,11 +138,11 @@ typedef struct p80211msg_dot11req_scan_results
typedef struct p80211msg_dot11req_associate typedef struct p80211msg_dot11req_associate
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ; p80211item_pstr6_t peerstaaddress ;
UINT8 pad_8C[1] ; u8 pad_8C[1] ;
p80211item_uint32_t associatefailuretimeout ; p80211item_uint32_t associatefailuretimeout ;
p80211item_uint32_t cfpollable ; p80211item_uint32_t cfpollable ;
p80211item_uint32_t cfpollreq ; p80211item_uint32_t cfpollreq ;
...@@ -154,22 +154,22 @@ typedef struct p80211msg_dot11req_associate ...@@ -154,22 +154,22 @@ typedef struct p80211msg_dot11req_associate
typedef struct p80211msg_dot11req_reset typedef struct p80211msg_dot11req_reset
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t setdefaultmib ; p80211item_uint32_t setdefaultmib ;
p80211item_pstr6_t macaddress ; p80211item_pstr6_t macaddress ;
UINT8 pad_11C[1] ; u8 pad_11C[1] ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_reset_t; } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_reset_t;
typedef struct p80211msg_dot11req_start typedef struct p80211msg_dot11req_start
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr32_t ssid ; p80211item_pstr32_t ssid ;
UINT8 pad_12D[3] ; u8 pad_12D[3] ;
p80211item_uint32_t bsstype ; p80211item_uint32_t bsstype ;
p80211item_uint32_t beaconperiod ; p80211item_uint32_t beaconperiod ;
p80211item_uint32_t dtimperiod ; p80211item_uint32_t dtimperiod ;
...@@ -204,70 +204,70 @@ typedef struct p80211msg_dot11req_start ...@@ -204,70 +204,70 @@ typedef struct p80211msg_dot11req_start
typedef struct p80211msg_dot11ind_authenticate typedef struct p80211msg_dot11ind_authenticate
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ; p80211item_pstr6_t peerstaaddress ;
UINT8 pad_13C[1] ; u8 pad_13C[1] ;
p80211item_uint32_t authenticationtype ; p80211item_uint32_t authenticationtype ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_authenticate_t; } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_authenticate_t;
typedef struct p80211msg_dot11ind_deauthenticate typedef struct p80211msg_dot11ind_deauthenticate
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ; p80211item_pstr6_t peerstaaddress ;
UINT8 pad_14C[1] ; u8 pad_14C[1] ;
p80211item_uint32_t reasoncode ; p80211item_uint32_t reasoncode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_deauthenticate_t; } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_deauthenticate_t;
typedef struct p80211msg_dot11ind_associate typedef struct p80211msg_dot11ind_associate
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ; p80211item_pstr6_t peerstaaddress ;
UINT8 pad_15C[1] ; u8 pad_15C[1] ;
p80211item_uint32_t aid ; p80211item_uint32_t aid ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_associate_t; } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_associate_t;
typedef struct p80211msg_dot11ind_reassociate typedef struct p80211msg_dot11ind_reassociate
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ; p80211item_pstr6_t peerstaaddress ;
UINT8 pad_16C[1] ; u8 pad_16C[1] ;
p80211item_uint32_t aid ; p80211item_uint32_t aid ;
p80211item_pstr6_t oldapaddress ; p80211item_pstr6_t oldapaddress ;
UINT8 pad_17C[1] ; u8 pad_17C[1] ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_reassociate_t; } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_reassociate_t;
typedef struct p80211msg_dot11ind_disassociate typedef struct p80211msg_dot11ind_disassociate
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ; p80211item_pstr6_t peerstaaddress ;
UINT8 pad_18C[1] ; u8 pad_18C[1] ;
p80211item_uint32_t reasoncode ; p80211item_uint32_t reasoncode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_disassociate_t; } __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_disassociate_t;
typedef struct p80211msg_lnxreq_ifstate typedef struct p80211msg_lnxreq_ifstate
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t ifstate ; p80211item_uint32_t ifstate ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_ifstate_t; } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_ifstate_t;
typedef struct p80211msg_lnxreq_wlansniff typedef struct p80211msg_lnxreq_wlansniff
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ; p80211item_uint32_t enable ;
p80211item_uint32_t channel ; p80211item_uint32_t channel ;
p80211item_uint32_t prismheader ; p80211item_uint32_t prismheader ;
...@@ -280,9 +280,9 @@ typedef struct p80211msg_lnxreq_wlansniff ...@@ -280,9 +280,9 @@ typedef struct p80211msg_lnxreq_wlansniff
typedef struct p80211msg_lnxreq_hostwep typedef struct p80211msg_lnxreq_hostwep
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
p80211item_uint32_t decrypt ; p80211item_uint32_t decrypt ;
p80211item_uint32_t encrypt ; p80211item_uint32_t encrypt ;
...@@ -290,9 +290,9 @@ typedef struct p80211msg_lnxreq_hostwep ...@@ -290,9 +290,9 @@ typedef struct p80211msg_lnxreq_hostwep
typedef struct p80211msg_lnxreq_commsquality typedef struct p80211msg_lnxreq_commsquality
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
p80211item_uint32_t dbm ; p80211item_uint32_t dbm ;
p80211item_uint32_t link ; p80211item_uint32_t link ;
...@@ -302,20 +302,20 @@ typedef struct p80211msg_lnxreq_commsquality ...@@ -302,20 +302,20 @@ typedef struct p80211msg_lnxreq_commsquality
typedef struct p80211msg_lnxreq_autojoin typedef struct p80211msg_lnxreq_autojoin
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr32_t ssid ; p80211item_pstr32_t ssid ;
UINT8 pad_19D[3] ; u8 pad_19D[3] ;
p80211item_uint32_t authtype ; p80211item_uint32_t authtype ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t; } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t;
typedef struct p80211msg_lnxind_wlansniffrm typedef struct p80211msg_lnxind_wlansniffrm
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t hosttime ; p80211item_uint32_t hosttime ;
p80211item_uint32_t mactime ; p80211item_uint32_t mactime ;
p80211item_uint32_t channel ; p80211item_uint32_t channel ;
...@@ -330,19 +330,19 @@ typedef struct p80211msg_lnxind_wlansniffrm ...@@ -330,19 +330,19 @@ typedef struct p80211msg_lnxind_wlansniffrm
typedef struct p80211msg_lnxind_roam typedef struct p80211msg_lnxind_roam
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t reason ; p80211item_uint32_t reason ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxind_roam_t; } __WLAN_ATTRIB_PACK__ p80211msg_lnxind_roam_t;
typedef struct p80211msg_p2req_join typedef struct p80211msg_p2req_join
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t bssid ; p80211item_pstr6_t bssid ;
UINT8 pad_20C[1] ; u8 pad_20C[1] ;
p80211item_uint32_t basicrate1 ; p80211item_uint32_t basicrate1 ;
p80211item_uint32_t basicrate2 ; p80211item_uint32_t basicrate2 ;
p80211item_uint32_t basicrate3 ; p80211item_uint32_t basicrate3 ;
...@@ -360,7 +360,7 @@ typedef struct p80211msg_p2req_join ...@@ -360,7 +360,7 @@ typedef struct p80211msg_p2req_join
p80211item_uint32_t operationalrate7 ; p80211item_uint32_t operationalrate7 ;
p80211item_uint32_t operationalrate8 ; p80211item_uint32_t operationalrate8 ;
p80211item_pstr32_t ssid ; p80211item_pstr32_t ssid ;
UINT8 pad_21D[3] ; u8 pad_21D[3] ;
p80211item_uint32_t channel ; p80211item_uint32_t channel ;
p80211item_uint32_t authtype ; p80211item_uint32_t authtype ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
...@@ -368,36 +368,36 @@ typedef struct p80211msg_p2req_join ...@@ -368,36 +368,36 @@ typedef struct p80211msg_p2req_join
typedef struct p80211msg_p2req_readpda typedef struct p80211msg_p2req_readpda
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk1024_t pda ; p80211item_unk1024_t pda ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t; } __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t;
typedef struct p80211msg_p2req_readcis typedef struct p80211msg_p2req_readcis
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk1024_t cis ; p80211item_unk1024_t cis ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readcis_t; } __WLAN_ATTRIB_PACK__ p80211msg_p2req_readcis_t;
typedef struct p80211msg_p2req_auxport_state typedef struct p80211msg_p2req_auxport_state
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ; p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_state_t; } __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_state_t;
typedef struct p80211msg_p2req_auxport_read typedef struct p80211msg_p2req_auxport_read
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ; p80211item_uint32_t addr ;
p80211item_uint32_t len ; p80211item_uint32_t len ;
p80211item_unk1024_t data ; p80211item_unk1024_t data ;
...@@ -406,9 +406,9 @@ typedef struct p80211msg_p2req_auxport_read ...@@ -406,9 +406,9 @@ typedef struct p80211msg_p2req_auxport_read
typedef struct p80211msg_p2req_auxport_write typedef struct p80211msg_p2req_auxport_write
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ; p80211item_uint32_t addr ;
p80211item_uint32_t len ; p80211item_uint32_t len ;
p80211item_unk1024_t data ; p80211item_unk1024_t data ;
...@@ -417,9 +417,9 @@ typedef struct p80211msg_p2req_auxport_write ...@@ -417,9 +417,9 @@ typedef struct p80211msg_p2req_auxport_write
typedef struct p80211msg_p2req_low_level typedef struct p80211msg_p2req_low_level
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t command ; p80211item_uint32_t command ;
p80211item_uint32_t param0 ; p80211item_uint32_t param0 ;
p80211item_uint32_t param1 ; p80211item_uint32_t param1 ;
...@@ -432,9 +432,9 @@ typedef struct p80211msg_p2req_low_level ...@@ -432,9 +432,9 @@ typedef struct p80211msg_p2req_low_level
typedef struct p80211msg_p2req_test_command typedef struct p80211msg_p2req_test_command
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t testcode ; p80211item_uint32_t testcode ;
p80211item_uint32_t testparam ; p80211item_uint32_t testparam ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
...@@ -446,9 +446,9 @@ typedef struct p80211msg_p2req_test_command ...@@ -446,9 +446,9 @@ typedef struct p80211msg_p2req_test_command
typedef struct p80211msg_p2req_mmi_read typedef struct p80211msg_p2req_mmi_read
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ; p80211item_uint32_t addr ;
p80211item_uint32_t value ; p80211item_uint32_t value ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
...@@ -456,9 +456,9 @@ typedef struct p80211msg_p2req_mmi_read ...@@ -456,9 +456,9 @@ typedef struct p80211msg_p2req_mmi_read
typedef struct p80211msg_p2req_mmi_write typedef struct p80211msg_p2req_mmi_write
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ; p80211item_uint32_t addr ;
p80211item_uint32_t data ; p80211item_uint32_t data ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
...@@ -466,9 +466,9 @@ typedef struct p80211msg_p2req_mmi_write ...@@ -466,9 +466,9 @@ typedef struct p80211msg_p2req_mmi_write
typedef struct p80211msg_p2req_ramdl_state typedef struct p80211msg_p2req_ramdl_state
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ; p80211item_uint32_t enable ;
p80211item_uint32_t exeaddr ; p80211item_uint32_t exeaddr ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
...@@ -476,9 +476,9 @@ typedef struct p80211msg_p2req_ramdl_state ...@@ -476,9 +476,9 @@ typedef struct p80211msg_p2req_ramdl_state
typedef struct p80211msg_p2req_ramdl_write typedef struct p80211msg_p2req_ramdl_write
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ; p80211item_uint32_t addr ;
p80211item_uint32_t len ; p80211item_uint32_t len ;
p80211item_unk4096_t data ; p80211item_unk4096_t data ;
...@@ -487,18 +487,18 @@ typedef struct p80211msg_p2req_ramdl_write ...@@ -487,18 +487,18 @@ typedef struct p80211msg_p2req_ramdl_write
typedef struct p80211msg_p2req_flashdl_state typedef struct p80211msg_p2req_flashdl_state
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ; p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_state_t; } __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_state_t;
typedef struct p80211msg_p2req_flashdl_write typedef struct p80211msg_p2req_flashdl_write
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ; p80211item_uint32_t addr ;
p80211item_uint32_t len ; p80211item_uint32_t len ;
p80211item_unk4096_t data ; p80211item_unk4096_t data ;
...@@ -507,18 +507,18 @@ typedef struct p80211msg_p2req_flashdl_write ...@@ -507,18 +507,18 @@ typedef struct p80211msg_p2req_flashdl_write
typedef struct p80211msg_p2req_mm_state typedef struct p80211msg_p2req_mm_state
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ; p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_mm_state_t; } __WLAN_ATTRIB_PACK__ p80211msg_p2req_mm_state_t;
typedef struct p80211msg_p2req_dump_state typedef struct p80211msg_p2req_dump_state
{ {
UINT32 msgcode ; u32 msgcode ;
UINT32 msglen ; u32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ; u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t level ; p80211item_uint32_t level ;
p80211item_uint32_t resultcode ; p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_dump_state_t; } __WLAN_ATTRIB_PACK__ p80211msg_p2req_dump_state_t;
......
...@@ -78,17 +78,17 @@ ...@@ -78,17 +78,17 @@
typedef struct p80211msg typedef struct p80211msg
{ {
UINT32 msgcode; u32 msgcode;
UINT32 msglen; u32 msglen;
UINT8 devname[WLAN_DEVNAMELEN_MAX]; u8 devname[WLAN_DEVNAMELEN_MAX];
} __WLAN_ATTRIB_PACK__ p80211msg_t; } __WLAN_ATTRIB_PACK__ p80211msg_t;
typedef struct p80211msgd typedef struct p80211msgd
{ {
UINT32 msgcode; u32 msgcode;
UINT32 msglen; u32 msglen;
UINT8 devname[WLAN_DEVNAMELEN_MAX]; u8 devname[WLAN_DEVNAMELEN_MAX];
UINT8 args[0]; u8 args[0];
} __WLAN_ATTRIB_PACK__ p80211msgd_t; } __WLAN_ATTRIB_PACK__ p80211msgd_t;
/*================================================================*/ /*================================================================*/
......
...@@ -128,7 +128,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev); ...@@ -128,7 +128,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev);
static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd); static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd);
static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr); static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr);
static void p80211knetdev_tx_timeout(netdevice_t *netdev); static void p80211knetdev_tx_timeout(netdevice_t *netdev);
static int p80211_rx_typedrop( wlandevice_t *wlandev, UINT16 fc); static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc);
/*================================================================*/ /*================================================================*/
...@@ -343,7 +343,7 @@ static void p80211netdev_rx_bh(unsigned long arg) ...@@ -343,7 +343,7 @@ static void p80211netdev_rx_bh(unsigned long arg)
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
netdevice_t *dev = wlandev->netdev; netdevice_t *dev = wlandev->netdev;
p80211_hdr_a3_t *hdr; p80211_hdr_a3_t *hdr;
UINT16 fc; u16 fc;
DBFENTER; DBFENTER;
...@@ -571,7 +571,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev) ...@@ -571,7 +571,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev)
static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr) static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)
{ {
UINT32 ethcmd; u32 ethcmd;
struct ethtool_drvinfo info; struct ethtool_drvinfo info;
struct ethtool_value edata; struct ethtool_value edata;
...@@ -638,7 +638,7 @@ static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr) ...@@ -638,7 +638,7 @@ static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)
* -EFAULT memory fault copying msg from user buffer * -EFAULT memory fault copying msg from user buffer
* -ENOMEM unable to allocate kernel msg buffer * -ENOMEM unable to allocate kernel msg buffer
* -ENOSYS bad magic, it the cmd really for us? * -ENOSYS bad magic, it the cmd really for us?
* -EINTR sleeping on cmd, awakened by signal, cmd cancelled. * -EintR sleeping on cmd, awakened by signal, cmd cancelled.
* *
* Call Context: * Call Context:
* Process thread (ioctl caller). TODO: SMP support may require * Process thread (ioctl caller). TODO: SMP support may require
...@@ -649,7 +649,7 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) ...@@ -649,7 +649,7 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
int result = 0; int result = 0;
p80211ioctl_req_t *req = (p80211ioctl_req_t*)ifr; p80211ioctl_req_t *req = (p80211ioctl_req_t*)ifr;
wlandevice_t *wlandev = dev->ml_priv; wlandevice_t *wlandev = dev->ml_priv;
UINT8 *msgbuf; u8 *msgbuf;
DBFENTER; DBFENTER;
WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len); WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len);
...@@ -769,7 +769,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr) ...@@ -769,7 +769,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
resultcode->data = 0; resultcode->data = 0;
/* now fire the request */ /* now fire the request */
result = p80211req_dorequest(dev->ml_priv, (UINT8 *)&dot11req); result = p80211req_dorequest(dev->ml_priv, (u8 *)&dot11req);
/* If the request wasn't successful, report an error and don't /* If the request wasn't successful, report an error and don't
* change the netdev address * change the netdev address
...@@ -1075,10 +1075,10 @@ void p80211netdev_hwremoved(wlandevice_t *wlandev) ...@@ -1075,10 +1075,10 @@ void p80211netdev_hwremoved(wlandevice_t *wlandev)
* Call context: * Call context:
* interrupt * interrupt
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int p80211_rx_typedrop( wlandevice_t *wlandev, UINT16 fc) static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc)
{ {
UINT16 ftype; u16 ftype;
UINT16 fstype; u16 fstype;
int drop = 0; int drop = 0;
/* Classify frame, increment counter */ /* Classify frame, increment counter */
ftype = WLAN_GET_FC_FTYPE(fc); ftype = WLAN_GET_FC_FTYPE(fc);
......
...@@ -125,7 +125,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mib ...@@ -125,7 +125,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, p80211msg_dot11req_mib
* Potentially blocks the caller, so it's a good idea to * Potentially blocks the caller, so it's a good idea to
* not call this function from an interrupt context. * not call this function from an interrupt context.
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int p80211req_dorequest( wlandevice_t *wlandev, UINT8 *msgbuf) int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf)
{ {
int result = 0; int result = 0;
p80211msg_t *msg = (p80211msg_t*)msgbuf; p80211msg_t *msg = (p80211msg_t*)msgbuf;
...@@ -223,13 +223,13 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -223,13 +223,13 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
{ {
p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data; p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data;
p80211pstrd_t *pstr = (p80211pstrd_t*) mibitem->data; p80211pstrd_t *pstr = (p80211pstrd_t*) mibitem->data;
UINT8 *key = mibitem->data + sizeof(p80211pstrd_t); u8 *key = mibitem->data + sizeof(p80211pstrd_t);
DBFENTER; DBFENTER;
switch (mibitem->did) { switch (mibitem->did) {
case DIDmib_dot11smt_p80211Table_p80211_ifstate: { case DIDmib_dot11smt_p80211Table_p80211_ifstate: {
UINT32 *data = (UINT32 *) mibitem->data; u32 *data = (u32 *) mibitem->data;
if (isget) if (isget)
switch (wlandev->msdstate) { switch (wlandev->msdstate) {
case WLAN_MSD_HWPRESENT: case WLAN_MSD_HWPRESENT:
...@@ -247,7 +247,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -247,7 +247,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
break; break;
} }
case DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled: { case DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled: {
UINT32 *data = (UINT32 *) mibitem->data; u32 *data = (u32 *) mibitem->data;
if (isget) if (isget)
*data = wlandev->shortpreamble; *data = wlandev->shortpreamble;
...@@ -276,7 +276,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -276,7 +276,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
break; break;
} }
case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID: { case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID: {
UINT32 *data = (UINT32 *) mibitem->data; u32 *data = (u32 *) mibitem->data;
if (isget) { if (isget) {
*data = wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK; *data = wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK;
...@@ -288,7 +288,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -288,7 +288,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
break; break;
} }
case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked: { case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked: {
UINT32 *data = (UINT32 *) mibitem->data; u32 *data = (u32 *) mibitem->data;
if (isget) { if (isget) {
if (wlandev->hostwep & HOSTWEP_PRIVACYINVOKED) if (wlandev->hostwep & HOSTWEP_PRIVACYINVOKED)
...@@ -303,7 +303,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -303,7 +303,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
break; break;
} }
case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted: { case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted: {
UINT32 *data = (UINT32 *) mibitem->data; u32 *data = (u32 *) mibitem->data;
if (isget) { if (isget) {
if (wlandev->hostwep & HOSTWEP_EXCLUDEUNENCRYPTED) if (wlandev->hostwep & HOSTWEP_EXCLUDEUNENCRYPTED)
......
...@@ -63,6 +63,6 @@ ...@@ -63,6 +63,6 @@
/*================================================================*/ /*================================================================*/
/* Function Declarations */ /* Function Declarations */
int p80211req_dorequest(wlandevice_t *wlandev, UINT8 *msgbuf); int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf);
#endif #endif
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册