Skip to content

L
linux
Commit aaad4303 authored by Solomon Peachy's avatar Solomon Peachy Committed by Greg Kroah-Hartman
Browse files
Options

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: default avatarSolomon Peachy <pizza@shaftnet.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5704976f
Hide whitespace changes
Inline Side-by-side
Showing with 1926 additions and 1953 deletions
drivers/staging/wlan-ng/hfa384x.h
View file @ aaad4303
This source diff could not be displayed because it is too large. You can view the blob instead.
drivers/staging/wlan-ng/hfa384x_usb.c
View file @ aaad4303
......@@ -299,9 +299,9 @@ static int
hfa384x_dorrid(
hfa384x_t *hw,
CMD_MODE mode,
UINT16 rid,
u16 rid,
void *riddata,
UINT riddatalen,
unsigned int riddatalen,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data);
......@@ -310,9 +310,9 @@ static int
hfa384x_dowrid(
hfa384x_t *hw,
CMD_MODE mode,
UINT16 rid,
u16 rid,
void *riddata,
UINT riddatalen,
unsigned int riddatalen,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data);
......@@ -321,10 +321,10 @@ static int
hfa384x_dormem(
hfa384x_t *hw,
CMD_MODE mode,
UINT16 page,
UINT16 offset,
u16 page,
u16 offset,
void *data,
UINT len,
unsigned int len,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data);
......@@ -333,16 +333,16 @@ static int
hfa384x_dowmem(
hfa384x_t *hw,
CMD_MODE mode,
UINT16 page,
UINT16 offset,
u16 page,
u16 offset,
void *data,
UINT len,
unsigned int len,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data);
static int
hfa384x_isgood_pdrcode(UINT16 pdrcode);
hfa384x_isgood_pdrcode(u16 pdrcode);
/*================================================================*/
/* Function Definitions */
......@@ -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->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_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->actual_length=0x%08x\n", urb->actual_length);
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->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->timeout=0x%08x\n", urb->timeout);
WLAN_LOG_DEBUG(3,"urb->context=0x%08x\n", (UINT)urb->context);
WLAN_LOG_DEBUG(3,"urb->complete=0x%08x\n", (UINT)urb->complete);
WLAN_LOG_DEBUG(3,"urb->context=0x%08x\n", (unsigned int)urb->context);
WLAN_LOG_DEBUG(3,"urb->complete=0x%08x\n", (unsigned int)urb->complete);
}
#endif
......@@ -829,7 +829,7 @@ struct usbctlx_rrid_completor
const hfa384x_usb_rridresp_t *rridresp;
void *riddata;
UINT riddatalen;
unsigned int riddatalen;
};
typedef struct usbctlx_rrid_completor usbctlx_rrid_completor_t;
......@@ -860,7 +860,7 @@ static inline usbctlx_completor_t*
init_rrid_completor(usbctlx_rrid_completor_t *completor,
const hfa384x_usb_rridresp_t *rridresp,
void *riddata,
UINT riddatalen)
unsigned int riddatalen)
{
completor->head.complete = usbctlx_rrid_completor_fn;
completor->rridresp = rridresp;
......@@ -893,7 +893,7 @@ struct usbctlx_rmem_completor
const hfa384x_usb_rmemresp_t *rmemresp;
void *data;
UINT len;
unsigned int len;
};
typedef struct usbctlx_rmem_completor usbctlx_rmem_completor_t;
......@@ -910,7 +910,7 @@ static inline usbctlx_completor_t*
init_rmem_completor(usbctlx_rmem_completor_t *completor,
hfa384x_usb_rmemresp_t *rmemresp,
void *data,
UINT len)
unsigned int len)
{
completor->head.complete = usbctlx_rmem_completor_fn;
completor->rmemresp = rmemresp;
......@@ -1021,7 +1021,7 @@ hfa384x_docmd_async(hfa384x_t *hw,
}
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,
rid, riddata, riddatalen,
......@@ -1030,7 +1030,7 @@ hfa384x_dorrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)
static inline int
hfa384x_dorrid_async(hfa384x_t *hw,
UINT16 rid, void *riddata, UINT riddatalen,
u16 rid, void *riddata, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data)
......@@ -1041,7 +1041,7 @@ hfa384x_dorrid_async(hfa384x_t *hw,
}
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,
rid, riddata, riddatalen,
......@@ -1050,7 +1050,7 @@ hfa384x_dowrid_wait(hfa384x_t *hw, UINT16 rid, void *riddata, UINT riddatalen)
static inline int
hfa384x_dowrid_async(hfa384x_t *hw,
UINT16 rid, void *riddata, UINT riddatalen,
u16 rid, void *riddata, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data)
......@@ -1062,7 +1062,7 @@ hfa384x_dowrid_async(hfa384x_t *hw,
static inline int
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,
page, offset, data, len,
......@@ -1071,7 +1071,7 @@ hfa384x_dormem_wait(hfa384x_t *hw,
static inline int
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_usercb_t usercb,
void *usercb_data)
......@@ -1084,10 +1084,10 @@ hfa384x_dormem_async(hfa384x_t *hw,
static inline int
hfa384x_dowmem_wait(
hfa384x_t *hw,
UINT16 page,
UINT16 offset,
u16 page,
u16 offset,
void *data,
UINT len)
unsigned int len)
{
return hfa384x_dowmem(hw, DOWAIT,
page, offset, data, len,
......@@ -1097,10 +1097,10 @@ hfa384x_dowmem_wait(
static inline int
hfa384x_dowmem_async(
hfa384x_t *hw,
UINT16 page,
UINT16 offset,
u16 page,
u16 offset,
void *data,
UINT len,
unsigned int len,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data)
......@@ -1187,7 +1187,7 @@ hfa384x_cmd_initialize(hfa384x_t *hw)
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport)
int hfa384x_cmd_disable(hfa384x_t *hw, u16 macport)
{
int result = 0;
hfa384x_metacmd_t cmd;
......@@ -1227,7 +1227,7 @@ int hfa384x_cmd_disable(hfa384x_t *hw, UINT16 macport)
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport)
int hfa384x_cmd_enable(hfa384x_t *hw, u16 macport)
{
int result = 0;
hfa384x_metacmd_t cmd;
......@@ -1276,12 +1276,12 @@ int hfa384x_cmd_enable(hfa384x_t *hw, UINT16 macport)
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_cmd_notify(hfa384x_t *hw, UINT16 reclaim, UINT16 fid,
void *buf, UINT16 len)
int hfa384x_cmd_notify(hfa384x_t *hw, u16 reclaim, u16 fid,
void *buf, u16 len)
{
#if 0
int result = 0;
UINT16 cmd;
u16 cmd;
DBFENTER;
cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_NOTIFY) |
HFA384x_CMD_RECL_SET(reclaim);
......@@ -1315,7 +1315,7 @@ return 0;
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid)
int hfa384x_cmd_inquiry(hfa384x_t *hw, u16 fid)
{
int result = 0;
hfa384x_metacmd_t cmd;
......@@ -1364,7 +1364,7 @@ int hfa384x_cmd_inquiry(hfa384x_t *hw, UINT16 fid)
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable)
int hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable)
{
int result = 0;
hfa384x_metacmd_t cmd;
......@@ -1422,8 +1422,8 @@ int hfa384x_cmd_monitor(hfa384x_t *hw, UINT16 enable)
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr,
UINT16 highaddr, UINT16 codelen)
int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr,
u16 highaddr, u16 codelen)
{
int result = 0;
hfa384x_metacmd_t cmd;
......@@ -1473,7 +1473,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, UINT16 mode, UINT16 lowaddr,
----------------------------------------------------------------*/
void
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;
WLAN_LOG_ERROR("not used in USB.\n");
......@@ -1507,7 +1507,7 @@ hfa384x_copy_from_aux(
----------------------------------------------------------------*/
void
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;
WLAN_LOG_ERROR("not used in USB.\n");
......@@ -1798,9 +1798,9 @@ static int
hfa384x_dorrid(
hfa384x_t *hw,
CMD_MODE mode,
UINT16 rid,
u16 rid,
void *riddata,
UINT riddatalen,
unsigned int riddatalen,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data)
......@@ -1884,9 +1884,9 @@ static int
hfa384x_dowrid(
hfa384x_t *hw,
CMD_MODE mode,
UINT16 rid,
u16 rid,
void *riddata,
UINT riddatalen,
unsigned int riddatalen,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data)
......@@ -1977,10 +1977,10 @@ static int
hfa384x_dormem(
hfa384x_t *hw,
CMD_MODE mode,
UINT16 page,
UINT16 offset,
u16 page,
u16 offset,
void *data,
UINT len,
unsigned int len,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data)
......@@ -2078,10 +2078,10 @@ static int
hfa384x_dowmem(
hfa384x_t *hw,
CMD_MODE mode,
UINT16 page,
UINT16 offset,
u16 page,
u16 offset,
void *data,
UINT len,
unsigned int len,
ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb,
void *usercb_data)
......@@ -2198,7 +2198,7 @@ int hfa384x_drvr_commtallies( hfa384x_t *hw )
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport)
int hfa384x_drvr_disable(hfa384x_t *hw, u16 macport)
{
int result = 0;
......@@ -2240,7 +2240,7 @@ int hfa384x_drvr_disable(hfa384x_t *hw, UINT16 macport)
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_drvr_enable(hfa384x_t *hw, UINT16 macport)
int hfa384x_drvr_enable(hfa384x_t *hw, u16 macport)
{
int result = 0;
......@@ -2393,22 +2393,22 @@ int hfa384x_drvr_flashdl_disable(hfa384x_t *hw)
int
hfa384x_drvr_flashdl_write(
hfa384x_t *hw,
UINT32 daddr,
u32 daddr,
void *buf,
UINT32 len)
u32 len)
{
int result = 0;
UINT32 dlbufaddr;
u32 dlbufaddr;
int nburns;
UINT32 burnlen;
UINT32 burndaddr;
UINT16 burnlo;
UINT16 burnhi;
u32 burnlen;
u32 burndaddr;
u16 burnlo;
u16 burnhi;
int nwrites;
UINT8 *writebuf;
UINT16 writepage;
UINT16 writeoffset;
UINT32 writelen;
u8 *writebuf;
u16 writepage;
u16 writeoffset;
u32 writelen;
int i;
int j;
......@@ -2559,7 +2559,7 @@ Comment out for debugging, assume the write was successful.
* Call context:
* 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;
DBFENTER;
......@@ -2600,7 +2600,7 @@ int hfa384x_drvr_getconfig(hfa384x_t *hw, UINT16 rid, void *buf, UINT16 len)
int
hfa384x_drvr_getconfig_async(
hfa384x_t *hw,
UINT16 rid,
u16 rid,
ctlx_usercb_t usercb,
void *usercb_data)
{
......@@ -2634,9 +2634,9 @@ hfa384x_drvr_getconfig_async(
int
hfa384x_drvr_setconfig_async(
hfa384x_t *hw,
UINT16 rid,
u16 rid,
void *buf,
UINT16 len,
u16 len,
ctlx_usercb_t usercb,
void *usercb_data)
{
......@@ -2663,7 +2663,7 @@ hfa384x_drvr_setconfig_async(
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_drvr_handover( hfa384x_t *hw, UINT8 *addr)
int hfa384x_drvr_handover( hfa384x_t *hw, u8 *addr)
{
DBFENTER;
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)
* Call context:
* 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
int result = 0;
UINT16 cmd_code = (UINT16) 0x30;
UINT16 param = (UINT16) addr;
u16 cmd_code = (u16) 0x30;
u16 param = (u16) addr;
DBFENTER;
/* Do i need a host2hfa... conversion ? */
......@@ -2756,13 +2756,13 @@ return 0;
----------------------------------------------------------------*/
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
int result = 0;
UINT16 cmd_code = (UINT16) 0x31;
UINT16 param0 = (UINT16) addr;
UINT16 param1 = (UINT16) data;
u16 cmd_code = (u16) 0x31;
u16 param0 = (u16) addr;
u16 param1 = (u16) data;
DBFENTER;
WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08lx\n", addr);
......@@ -2842,11 +2842,11 @@ hfa384x_drvr_ramdl_disable(hfa384x_t *hw)
* process
----------------------------------------------------------------*/
int
hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr)
hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr)
{
int result = 0;
UINT16 lowaddr;
UINT16 hiaddr;
u16 lowaddr;
u16 hiaddr;
int i;
DBFENTER;
/* Check that a port isn't active */
......@@ -2917,16 +2917,16 @@ hfa384x_drvr_ramdl_enable(hfa384x_t *hw, UINT32 exeaddr)
* process
----------------------------------------------------------------*/
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 nwrites;
UINT8 *data = buf;
u8 *data = buf;
int i;
UINT32 curraddr;
UINT16 currpage;
UINT16 curroffset;
UINT16 currlen;
u32 curraddr;
u16 currpage;
u16 curroffset;
u16 currlen;
DBFENTER;
/* Check that we're in the ram download state */
if ( hw->dlstate != HFA384x_DLSTATE_RAMENABLED ) {
......@@ -2998,21 +2998,21 @@ hfa384x_drvr_ramdl_write(hfa384x_t *hw, UINT32 daddr, void* buf, UINT32 len)
* Call context:
* 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;
UINT16 *pda = buf;
u16 *pda = buf;
int pdaok = 0;
int morepdrs = 1;
int currpdr = 0; /* word offset of the current pdr */
size_t i;
UINT16 pdrlen; /* pdr length in bytes, host order */
UINT16 pdrcode; /* pdr code, host order */
UINT16 currpage;
UINT16 curroffset;
u16 pdrlen; /* pdr length in bytes, host order */
u16 pdrcode; /* pdr code, host order */
u16 currpage;
u16 curroffset;
struct pdaloc {
UINT32 cardaddr;
UINT16 auxctl;
u32 cardaddr;
u16 auxctl;
} pdaloc[] =
{
{ HFA3842_PDA_BASE, 0},
......@@ -3116,7 +3116,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, UINT len)
* Call context:
* 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);
}
......@@ -3734,7 +3734,7 @@ static void hfa384x_usbin_callback(struct urb *urb, struct pt_regs *regs)
struct sk_buff *skb = NULL;
int result;
int urb_status;
UINT16 type;
u16 type;
enum USBIN_ACTION {
HANDLE,
......@@ -3961,7 +3961,7 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin,
if (unlocked_usbctlx_cancel_async(hw, ctlx) == 0)
run_queue = 1;
} 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 ...
......@@ -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)
{
UINT16 status;
u16 status;
DBFENTER;
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)
hfa384x_t *hw = wlandev->priv;
int hdrlen;
p80211_rxmeta_t *rxmeta;
UINT16 data_len;
UINT16 fc;
u16 data_len;
u16 fc;
DBFENTER;
......@@ -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)
{
hfa384x_rx_frame_t *rxdesc = &(rxfrm->desc);
UINT hdrlen = 0;
UINT datalen = 0;
UINT skblen = 0;
unsigned int hdrlen = 0;
unsigned int datalen = 0;
unsigned int skblen = 0;
p80211msg_lnxind_wlansniffrm_t *msg;
UINT8 *datap;
UINT16 fc;
u8 *datap;
u16 fc;
struct sk_buff *skb;
hfa384x_t *hw = wlandev->priv;
......@@ -4842,7 +4842,7 @@ static void hfa384x_usbout_tx(wlandevice_t *wlandev, hfa384x_usbout_t *usbout)
* Call context:
----------------------------------------------------------------*/
static int
hfa384x_isgood_pdrcode(UINT16 pdrcode)
hfa384x_isgood_pdrcode(u16 pdrcode)
{
switch(pdrcode) {
case HFA384x_PDR_END_OF_PDA:
......
drivers/staging/wlan-ng/p80211conv.c
View file @ aaad4303
......@@ -99,8 +99,8 @@
/*================================================================*/
/* Local Static Definitions */
static UINT8 oui_rfc1042[] = {0x00, 0x00, 0x00};
static UINT8 oui_8021h[] = {0x00, 0x00, 0xf8};
static u8 oui_rfc1042[] = {0x00, 0x00, 0x00};
static u8 oui_8021h[] = {0x00, 0x00, 0xf8};
/*================================================================*/
/* Local Function Declarations */
......@@ -134,11 +134,11 @@ static UINT8 oui_8021h[] = {0x00, 0x00, 0xf8};
* Call 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;
UINT16 proto;
u16 fc;
u16 proto;
wlan_ethhdr_t e_hdr;
wlan_llc_t *e_llc;
wlan_snap_t *e_snap;
......@@ -297,14 +297,14 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,
* Call 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;
UINT16 fc;
UINT payload_length;
UINT payload_offset;
UINT8 daddr[WLAN_ETHADDR_LEN];
UINT8 saddr[WLAN_ETHADDR_LEN];
u16 fc;
unsigned int payload_length;
unsigned int payload_offset;
u8 daddr[WLAN_ETHADDR_LEN];
u8 saddr[WLAN_ETHADDR_LEN];
p80211_hdr_t *w_hdr;
wlan_ethhdr_t *e_hdr;
wlan_llc_t *e_llc;
......@@ -488,7 +488,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *
* Call 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 */
/* Zoom Win95 driver when 802.1h mode is selected */
......
drivers/staging/wlan-ng/p80211conv.h
View file @ aaad4303
......@@ -86,22 +86,22 @@ typedef struct p80211_rxmeta
{
struct wlandevice *wlandev;
UINT64 mactime; /* Hi-rez MAC-supplied time value */
UINT64 hosttime; /* Best-rez host supplied time value */
u64 mactime; /* Hi-rez MAC-supplied time value */
u64 hosttime; /* Best-rez host supplied time value */
UINT rxrate; /* Receive data rate in 100kbps */
UINT priority; /* 0-15, 0=contention, 6=CF */
INT signal; /* An SSI, see p80211netdev.h */
INT noise; /* An SSI, see p80211netdev.h */
UINT channel; /* Receive channel (mostly for snifs) */
UINT preamble; /* P80211ENUM_preambletype_* */
UINT encoding; /* P80211ENUM_encoding_* */
unsigned int rxrate; /* Receive data rate in 100kbps */
unsigned int priority; /* 0-15, 0=contention, 6=CF */
int signal; /* An SSI, see p80211netdev.h */
int noise; /* An SSI, see p80211netdev.h */
unsigned int channel; /* Receive channel (mostly for snifs) */
unsigned int preamble; /* P80211ENUM_preambletype_* */
unsigned int encoding; /* P80211ENUM_encoding_* */
} p80211_rxmeta_t;
typedef struct p80211_frmmeta
{
UINT magic;
unsigned int magic;
p80211_rxmeta_t *rx;
} p80211_frmmeta_t;
......@@ -117,20 +117,20 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb);
*/
typedef struct p80211_caphdr
{
UINT32 version;
UINT32 length;
UINT64 mactime;
UINT64 hosttime;
UINT32 phytype;
UINT32 channel;
UINT32 datarate;
UINT32 antenna;
UINT32 priority;
UINT32 ssi_type;
INT32 ssi_signal;
INT32 ssi_noise;
UINT32 preamble;
UINT32 encoding;
u32 version;
u32 length;
u64 mactime;
u64 hosttime;
u32 phytype;
u32 channel;
u32 datarate;
u32 antenna;
u32 priority;
u32 ssi_type;
s32 ssi_signal;
s32 ssi_noise;
u32 preamble;
u32 encoding;
} p80211_caphdr_t;
/* buffer free method pointer type */
......@@ -138,31 +138,31 @@ typedef void (* freebuf_method_t)(void *buf, int size);
typedef struct p80211_metawep {
void *data;
UINT8 iv[4];
UINT8 icv[4];
u8 iv[4];
u8 icv[4];
} p80211_metawep_t;
/* local ether header type */
typedef struct wlan_ethhdr
{
UINT8 daddr[WLAN_ETHADDR_LEN];
UINT8 saddr[WLAN_ETHADDR_LEN];
UINT16 type;
u8 daddr[WLAN_ETHADDR_LEN];
u8 saddr[WLAN_ETHADDR_LEN];
u16 type;
} __WLAN_ATTRIB_PACK__ wlan_ethhdr_t;
/* local llc header type */
typedef struct wlan_llc
{
UINT8 dsap;
UINT8 ssap;
UINT8 ctl;
u8 dsap;
u8 ssap;
u8 ctl;
} __WLAN_ATTRIB_PACK__ wlan_llc_t;
/* local snap header type */
typedef struct wlan_snap
{
UINT8 oui[WLAN_IEEE_OUI_LEN];
UINT16 type;
u8 oui[WLAN_IEEE_OUI_LEN];
u16 type;
} __WLAN_ATTRIB_PACK__ wlan_snap_t;
/* Circular include trick */
......@@ -174,13 +174,13 @@ struct wlandevice;
/*================================================================*/
/*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);
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,
p80211_metawep_t *p80211_wep );
int p80211_stt_findproto(UINT16 proto);
int p80211_stt_addproto(UINT16 proto);
int p80211_stt_findproto(u16 proto);
int p80211_stt_addproto(u16 proto);
#endif
drivers/staging/wlan-ng/p80211hdr.h
View file @ aaad4303
......@@ -166,29 +166,29 @@
/* SET_FC_FSTYPE(WLAN_FSTYPE_RTS) ); */
/*------------------------------------------------------------*/
#define WLAN_GET_FC_PVER(n) (((UINT16)(n)) & (BIT0 | BIT1))
#define WLAN_GET_FC_FTYPE(n) ((((UINT16)(n)) & (BIT2 | BIT3)) >> 2)
#define WLAN_GET_FC_FSTYPE(n) ((((UINT16)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4)
#define WLAN_GET_FC_TODS(n) ((((UINT16)(n)) & (BIT8)) >> 8)
#define WLAN_GET_FC_FROMDS(n) ((((UINT16)(n)) & (BIT9)) >> 9)
#define WLAN_GET_FC_MOREFRAG(n) ((((UINT16)(n)) & (BIT10)) >> 10)
#define WLAN_GET_FC_RETRY(n) ((((UINT16)(n)) & (BIT11)) >> 11)
#define WLAN_GET_FC_PWRMGT(n) ((((UINT16)(n)) & (BIT12)) >> 12)
#define WLAN_GET_FC_MOREDATA(n) ((((UINT16)(n)) & (BIT13)) >> 13)
#define WLAN_GET_FC_ISWEP(n) ((((UINT16)(n)) & (BIT14)) >> 14)
#define WLAN_GET_FC_ORDER(n) ((((UINT16)(n)) & (BIT15)) >> 15)
#define WLAN_SET_FC_PVER(n) ((UINT16)(n))
#define WLAN_SET_FC_FTYPE(n) (((UINT16)(n)) << 2)
#define WLAN_SET_FC_FSTYPE(n) (((UINT16)(n)) << 4)
#define WLAN_SET_FC_TODS(n) (((UINT16)(n)) << 8)
#define WLAN_SET_FC_FROMDS(n) (((UINT16)(n)) << 9)
#define WLAN_SET_FC_MOREFRAG(n) (((UINT16)(n)) << 10)
#define WLAN_SET_FC_RETRY(n) (((UINT16)(n)) << 11)
#define WLAN_SET_FC_PWRMGT(n) (((UINT16)(n)) << 12)
#define WLAN_SET_FC_MOREDATA(n) (((UINT16)(n)) << 13)
#define WLAN_SET_FC_ISWEP(n) (((UINT16)(n)) << 14)
#define WLAN_SET_FC_ORDER(n) (((UINT16)(n)) << 15)
#define WLAN_GET_FC_PVER(n) (((u16)(n)) & (BIT0 | BIT1))
#define WLAN_GET_FC_FTYPE(n) ((((u16)(n)) & (BIT2 | BIT3)) >> 2)
#define WLAN_GET_FC_FSTYPE(n) ((((u16)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4)
#define WLAN_GET_FC_TODS(n) ((((u16)(n)) & (BIT8)) >> 8)
#define WLAN_GET_FC_FROMDS(n) ((((u16)(n)) & (BIT9)) >> 9)
#define WLAN_GET_FC_MOREFRAG(n) ((((u16)(n)) & (BIT10)) >> 10)
#define WLAN_GET_FC_RETRY(n) ((((u16)(n)) & (BIT11)) >> 11)
#define WLAN_GET_FC_PWRMGT(n) ((((u16)(n)) & (BIT12)) >> 12)
#define WLAN_GET_FC_MOREDATA(n) ((((u16)(n)) & (BIT13)) >> 13)
#define WLAN_GET_FC_ISWEP(n) ((((u16)(n)) & (BIT14)) >> 14)
#define WLAN_GET_FC_ORDER(n) ((((u16)(n)) & (BIT15)) >> 15)
#define WLAN_SET_FC_PVER(n) ((u16)(n))
#define WLAN_SET_FC_FTYPE(n) (((u16)(n)) << 2)
#define WLAN_SET_FC_FSTYPE(n) (((u16)(n)) << 4)
#define WLAN_SET_FC_TODS(n) (((u16)(n)) << 8)
#define WLAN_SET_FC_FROMDS(n) (((u16)(n)) << 9)
#define WLAN_SET_FC_MOREFRAG(n) (((u16)(n)) << 10)
#define WLAN_SET_FC_RETRY(n) (((u16)(n)) << 11)
#define WLAN_SET_FC_PWRMGT(n) (((u16)(n)) << 12)
#define WLAN_SET_FC_MOREDATA(n) (((u16)(n)) << 13)
#define WLAN_SET_FC_ISWEP(n) (((u16)(n)) << 14)
#define WLAN_SET_FC_ORDER(n) (((u16)(n)) << 15)
/*--- Duration Macros ----------------------------------------*/
/* Macros to get/set the bitfields of the Duration Field */
......@@ -201,45 +201,45 @@
/* Macros to get/set the bitfields of the Sequence Control */
/* Field. */
/*------------------------------------------------------------*/
#define WLAN_GET_SEQ_FRGNUM(n) (((UINT16)(n)) & (BIT0|BIT1|BIT2|BIT3))
#define WLAN_GET_SEQ_SEQNUM(n) ((((UINT16)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
#define WLAN_GET_SEQ_FRGNUM(n) (((u16)(n)) & (BIT0|BIT1|BIT2|BIT3))
#define WLAN_GET_SEQ_SEQNUM(n) ((((u16)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4)
/*--- 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*/
/*------------------------------------------------------------*/
#define WLAN_HDR_A3_DATAP(p) (((UINT8*)(p)) + WLAN_HDR_A3_LEN)
#define WLAN_HDR_A4_DATAP(p) (((UINT8*)(p)) + WLAN_HDR_A4_LEN)
#define WLAN_HDR_A3_DATAP(p) (((u8*)(p)) + WLAN_HDR_A3_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 */
/* 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 */
typedef struct p80211_hdr_a3
{
UINT16 fc;
UINT16 dur;
UINT8 a1[WLAN_ADDR_LEN];
UINT8 a2[WLAN_ADDR_LEN];
UINT8 a3[WLAN_ADDR_LEN];
UINT16 seq;
u16 fc;
u16 dur;
u8 a1[WLAN_ADDR_LEN];
u8 a2[WLAN_ADDR_LEN];
u8 a3[WLAN_ADDR_LEN];
u16 seq;
} __WLAN_ATTRIB_PACK__ p80211_hdr_a3_t;
typedef struct p80211_hdr_a4
{
UINT16 fc;
UINT16 dur;
UINT8 a1[WLAN_ADDR_LEN];
UINT8 a2[WLAN_ADDR_LEN];
UINT8 a3[WLAN_ADDR_LEN];
UINT16 seq;
UINT8 a4[WLAN_ADDR_LEN];
u16 fc;
u16 dur;
u8 a1[WLAN_ADDR_LEN];
u8 a2[WLAN_ADDR_LEN];
u8 a3[WLAN_ADDR_LEN];
u16 seq;
u8 a4[WLAN_ADDR_LEN];
} __WLAN_ATTRIB_PACK__ p80211_hdr_a4_t;
typedef union p80211_hdr
......@@ -271,9 +271,9 @@ typedef union p80211_hdr
#define WLAN_FCS_LEN 4
/* 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) ) {
case WLAN_FTYPE_MGMT:
......
drivers/staging/wlan-ng/p80211ioctl.h
View file @ aaad4303
......@@ -106,9 +106,9 @@ typedef struct p80211ioctl_req
{
char name[WLAN_DEVNAMELEN_MAX];
caddr_t data;
UINT32 magic;
UINT16 len;
UINT32 result;
u32 magic;
u16 len;
u32 result;
} __WLAN_ATTRIB_PACK__ p80211ioctl_req_t;
......
drivers/staging/wlan-ng/p80211meta.h
View file @ aaad4303
......@@ -90,7 +90,7 @@
#define MKMIBMETASIZE(name) p80211meta_ ## mib ## _ ## 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: */
......@@ -114,14 +114,14 @@
typedef struct p80211meta
{
char *name; /* data item name */
UINT32 did; /* partial did */
UINT32 flags; /* set of various flag bits */
UINT32 min; /* min value of a BOUNDEDINT */
UINT32 max; /* max value of a BOUNDEDINT */
UINT32 maxlen; /* maxlen of a OCTETSTR or DISPLAYSTR */
UINT32 minlen; /* minlen of a OCTETSTR or DISPLAYSTR */
p80211enum_t *enumptr; /* ptr to the enum type for ENUMINT */
u32 did; /* partial did */
u32 flags; /* set of various flag bits */
u32 min; /* min value of a BOUNDEDint */
u32 max; /* max value of a BOUNDEDint */
u32 maxlen; /* maxlen of a OCTETSTR or DISPLAYSTR */
u32 minlen; /* minlen of a OCTETSTR or DISPLAYSTR */
p80211enum_t *enumptr; /* ptr to the enum type for ENUMint */
p80211_totext_t totextptr; /* ptr to totext conversion function */
p80211_fromtext_t fromtextptr; /* ptr to totext conversion function */
p80211_valid_t validfunptr; /* ptr to totext conversion function */
......@@ -150,20 +150,20 @@ typedef struct catlistitem
/*----------------------------------------------------------------*/
/* */
UINT32 p80211_text2did(catlistitem_t *catlist, char *catname, char *grpname, char *itemname);
UINT32 p80211_text2catdid(catlistitem_t *list, char *name );
UINT32 p80211_text2grpdid(grplistitem_t *list, char *name );
UINT32 p80211_text2itemdid(p80211meta_t *list, char *name );
UINT32 p80211_isvalid_did( catlistitem_t *catlist, UINT32 did );
UINT32 p80211_isvalid_catdid( catlistitem_t *catlist, UINT32 did );
UINT32 p80211_isvalid_grpdid( catlistitem_t *catlist, UINT32 did );
UINT32 p80211_isvalid_itemdid( catlistitem_t *catlist, UINT32 did );
catlistitem_t *p80211_did2cat( catlistitem_t *catlist, UINT32 did );
grplistitem_t *p80211_did2grp( catlistitem_t *catlist, UINT32 did );
p80211meta_t *p80211_did2item( catlistitem_t *catlist, UINT32 did );
UINT32 p80211item_maxdatalen( struct catlistitem *metalist, UINT32 did );
UINT32 p80211_metaname2did(struct catlistitem *metalist, char *itemname);
UINT32 p80211item_getoffset( struct catlistitem *metalist, UINT32 did );
u32 p80211_text2did(catlistitem_t *catlist, char *catname, char *grpname, char *itemname);
u32 p80211_text2catdid(catlistitem_t *list, char *name );
u32 p80211_text2grpdid(grplistitem_t *list, char *name );
u32 p80211_text2itemdid(p80211meta_t *list, char *name );
u32 p80211_isvalid_did( catlistitem_t *catlist, u32 did );
u32 p80211_isvalid_catdid( catlistitem_t *catlist, u32 did );
u32 p80211_isvalid_grpdid( catlistitem_t *catlist, u32 did );
u32 p80211_isvalid_itemdid( catlistitem_t *catlist, u32 did );
catlistitem_t *p80211_did2cat( catlistitem_t *catlist, u32 did );
grplistitem_t *p80211_did2grp( catlistitem_t *catlist, u32 did );
p80211meta_t *p80211_did2item( catlistitem_t *catlist, u32 did );
u32 p80211item_maxdatalen( struct catlistitem *metalist, u32 did );
u32 p80211_metaname2did(struct catlistitem *metalist, char *itemname);
u32 p80211item_getoffset( struct catlistitem *metalist, u32 did );
int p80211item_gettype(p80211meta_t *meta);
#endif /* _P80211META_H */
drivers/staging/wlan-ng/p80211metamib.h
View file @ aaad4303
......@@ -93,7 +93,7 @@
/* category metadata list */
extern catlistitem_t mib_catlist[];
extern UINT32 mib_catlist_size;
extern u32 mib_catlist_size;
/*================================================================*/
......
drivers/staging/wlan-ng/p80211metamsg.h
View file @ aaad4303
......@@ -93,7 +93,7 @@
/* category metadata list */
extern catlistitem_t msg_catlist[];
extern UINT32 msg_catlist_size;
extern u32 msg_catlist_size;
/*================================================================*/
......
drivers/staging/wlan-ng/p80211metastruct.h
View file @ aaad4303
......@@ -50,36 +50,36 @@
typedef struct p80211msg_dot11req_mibget
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk392_t mibattribute ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibget_t;
typedef struct p80211msg_dot11req_mibset
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk392_t mibattribute ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t;
typedef struct p80211msg_dot11req_scan
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t bsstype ;
p80211item_pstr6_t bssid ;
UINT8 pad_0C[1] ;
u8 pad_0C[1] ;
p80211item_pstr32_t ssid ;
UINT8 pad_1D[3] ;
u8 pad_1D[3] ;
p80211item_uint32_t scantype ;
p80211item_uint32_t probedelay ;
p80211item_pstr14_t channellist ;
UINT8 pad_2C[1] ;
u8 pad_2C[1] ;
p80211item_uint32_t minchanneltime ;
p80211item_uint32_t maxchanneltime ;
p80211item_uint32_t resultcode ;
......@@ -89,17 +89,17 @@ typedef struct p80211msg_dot11req_scan
typedef struct p80211msg_dot11req_scan_results
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t bssindex ;
p80211item_uint32_t resultcode ;
p80211item_uint32_t signal ;
p80211item_uint32_t noise ;
p80211item_pstr6_t bssid ;
UINT8 pad_3C[1] ;
u8 pad_3C[1] ;
p80211item_pstr32_t ssid ;
UINT8 pad_4D[3] ;
u8 pad_4D[3] ;
p80211item_uint32_t bsstype ;
p80211item_uint32_t beaconperiod ;
p80211item_uint32_t dtimperiod ;
......@@ -138,11 +138,11 @@ typedef struct p80211msg_dot11req_scan_results
typedef struct p80211msg_dot11req_associate
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
UINT8 pad_8C[1] ;
u8 pad_8C[1] ;
p80211item_uint32_t associatefailuretimeout ;
p80211item_uint32_t cfpollable ;
p80211item_uint32_t cfpollreq ;
......@@ -154,22 +154,22 @@ typedef struct p80211msg_dot11req_associate
typedef struct p80211msg_dot11req_reset
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t setdefaultmib ;
p80211item_pstr6_t macaddress ;
UINT8 pad_11C[1] ;
u8 pad_11C[1] ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_reset_t;
typedef struct p80211msg_dot11req_start
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr32_t ssid ;
UINT8 pad_12D[3] ;
u8 pad_12D[3] ;
p80211item_uint32_t bsstype ;
p80211item_uint32_t beaconperiod ;
p80211item_uint32_t dtimperiod ;
......@@ -204,70 +204,70 @@ typedef struct p80211msg_dot11req_start
typedef struct p80211msg_dot11ind_authenticate
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
UINT8 pad_13C[1] ;
u8 pad_13C[1] ;
p80211item_uint32_t authenticationtype ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_authenticate_t;
typedef struct p80211msg_dot11ind_deauthenticate
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
UINT8 pad_14C[1] ;
u8 pad_14C[1] ;
p80211item_uint32_t reasoncode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_deauthenticate_t;
typedef struct p80211msg_dot11ind_associate
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
UINT8 pad_15C[1] ;
u8 pad_15C[1] ;
p80211item_uint32_t aid ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_associate_t;
typedef struct p80211msg_dot11ind_reassociate
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
UINT8 pad_16C[1] ;
u8 pad_16C[1] ;
p80211item_uint32_t aid ;
p80211item_pstr6_t oldapaddress ;
UINT8 pad_17C[1] ;
u8 pad_17C[1] ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_reassociate_t;
typedef struct p80211msg_dot11ind_disassociate
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
UINT8 pad_18C[1] ;
u8 pad_18C[1] ;
p80211item_uint32_t reasoncode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_disassociate_t;
typedef struct p80211msg_lnxreq_ifstate
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t ifstate ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_ifstate_t;
typedef struct p80211msg_lnxreq_wlansniff
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ;
p80211item_uint32_t channel ;
p80211item_uint32_t prismheader ;
......@@ -280,9 +280,9 @@ typedef struct p80211msg_lnxreq_wlansniff
typedef struct p80211msg_lnxreq_hostwep
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t resultcode ;
p80211item_uint32_t decrypt ;
p80211item_uint32_t encrypt ;
......@@ -290,9 +290,9 @@ typedef struct p80211msg_lnxreq_hostwep
typedef struct p80211msg_lnxreq_commsquality
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t resultcode ;
p80211item_uint32_t dbm ;
p80211item_uint32_t link ;
......@@ -302,20 +302,20 @@ typedef struct p80211msg_lnxreq_commsquality
typedef struct p80211msg_lnxreq_autojoin
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr32_t ssid ;
UINT8 pad_19D[3] ;
u8 pad_19D[3] ;
p80211item_uint32_t authtype ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t;
typedef struct p80211msg_lnxind_wlansniffrm
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t hosttime ;
p80211item_uint32_t mactime ;
p80211item_uint32_t channel ;
......@@ -330,19 +330,19 @@ typedef struct p80211msg_lnxind_wlansniffrm
typedef struct p80211msg_lnxind_roam
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t reason ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxind_roam_t;
typedef struct p80211msg_p2req_join
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t bssid ;
UINT8 pad_20C[1] ;
u8 pad_20C[1] ;
p80211item_uint32_t basicrate1 ;
p80211item_uint32_t basicrate2 ;
p80211item_uint32_t basicrate3 ;
......@@ -360,7 +360,7 @@ typedef struct p80211msg_p2req_join
p80211item_uint32_t operationalrate7 ;
p80211item_uint32_t operationalrate8 ;
p80211item_pstr32_t ssid ;
UINT8 pad_21D[3] ;
u8 pad_21D[3] ;
p80211item_uint32_t channel ;
p80211item_uint32_t authtype ;
p80211item_uint32_t resultcode ;
......@@ -368,36 +368,36 @@ typedef struct p80211msg_p2req_join
typedef struct p80211msg_p2req_readpda
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk1024_t pda ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t;
typedef struct p80211msg_p2req_readcis
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk1024_t cis ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readcis_t;
typedef struct p80211msg_p2req_auxport_state
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_state_t;
typedef struct p80211msg_p2req_auxport_read
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t len ;
p80211item_unk1024_t data ;
......@@ -406,9 +406,9 @@ typedef struct p80211msg_p2req_auxport_read
typedef struct p80211msg_p2req_auxport_write
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t len ;
p80211item_unk1024_t data ;
......@@ -417,9 +417,9 @@ typedef struct p80211msg_p2req_auxport_write
typedef struct p80211msg_p2req_low_level
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t command ;
p80211item_uint32_t param0 ;
p80211item_uint32_t param1 ;
......@@ -432,9 +432,9 @@ typedef struct p80211msg_p2req_low_level
typedef struct p80211msg_p2req_test_command
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t testcode ;
p80211item_uint32_t testparam ;
p80211item_uint32_t resultcode ;
......@@ -446,9 +446,9 @@ typedef struct p80211msg_p2req_test_command
typedef struct p80211msg_p2req_mmi_read
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t value ;
p80211item_uint32_t resultcode ;
......@@ -456,9 +456,9 @@ typedef struct p80211msg_p2req_mmi_read
typedef struct p80211msg_p2req_mmi_write
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t data ;
p80211item_uint32_t resultcode ;
......@@ -466,9 +466,9 @@ typedef struct p80211msg_p2req_mmi_write
typedef struct p80211msg_p2req_ramdl_state
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ;
p80211item_uint32_t exeaddr ;
p80211item_uint32_t resultcode ;
......@@ -476,9 +476,9 @@ typedef struct p80211msg_p2req_ramdl_state
typedef struct p80211msg_p2req_ramdl_write
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t len ;
p80211item_unk4096_t data ;
......@@ -487,18 +487,18 @@ typedef struct p80211msg_p2req_ramdl_write
typedef struct p80211msg_p2req_flashdl_state
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_state_t;
typedef struct p80211msg_p2req_flashdl_write
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t len ;
p80211item_unk4096_t data ;
......@@ -507,18 +507,18 @@ typedef struct p80211msg_p2req_flashdl_write
typedef struct p80211msg_p2req_mm_state
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_mm_state_t;
typedef struct p80211msg_p2req_dump_state
{
UINT32 msgcode ;
UINT32 msglen ;
UINT8 devname[WLAN_DEVNAMELEN_MAX] ;
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t level ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_dump_state_t;
......
drivers/staging/wlan-ng/p80211mgmt.h
View file @ aaad4303
......@@ -172,14 +172,14 @@
/* Note: These offsets are from the start of the frame data */
#define WLAN_BEACON_OFF_TS 0
#define WLAN_BEACON_OFF_BCN_INT 8
#define WLAN_BEACON_OFF_BCN_int 8
#define WLAN_BEACON_OFF_CAPINFO 10
#define WLAN_BEACON_OFF_SSID 12
#define WLAN_DISASSOC_OFF_REASON 0
#define WLAN_ASSOCREQ_OFF_CAP_INFO 0
#define WLAN_ASSOCREQ_OFF_LISTEN_INT 2
#define WLAN_ASSOCREQ_OFF_LISTEN_int 2
#define WLAN_ASSOCREQ_OFF_SSID 4
#define WLAN_ASSOCRESP_OFF_CAP_INFO 0
......@@ -188,7 +188,7 @@
#define WLAN_ASSOCRESP_OFF_SUPP_RATES 6
#define WLAN_REASSOCREQ_OFF_CAP_INFO 0
#define WLAN_REASSOCREQ_OFF_LISTEN_INT 2
#define WLAN_REASSOCREQ_OFF_LISTEN_int 2
#define WLAN_REASSOCREQ_OFF_CURR_AP 4
#define WLAN_REASSOCREQ_OFF_SSID 10
......@@ -200,7 +200,7 @@
#define WLAN_PROBEREQ_OFF_SSID 0
#define WLAN_PROBERESP_OFF_TS 0
#define WLAN_PROBERESP_OFF_BCN_INT 8
#define WLAN_PROBERESP_OFF_BCN_int 8
#define WLAN_PROBERESP_OFF_CAP_INFO 10
#define WLAN_PROBERESP_OFF_SSID 12
......@@ -245,82 +245,82 @@
typedef struct wlan_ie
{
UINT8 eid;
UINT8 len;
u8 eid;
u8 len;
} __WLAN_ATTRIB_PACK__ wlan_ie_t;
/*-- Service Set Identity (SSID) -----------------*/
typedef struct wlan_ie_ssid
{
UINT8 eid;
UINT8 len;
UINT8 ssid[1]; /* may be zero, ptrs may overlap */
u8 eid;
u8 len;
u8 ssid[1]; /* may be zero, ptrs may overlap */
} __WLAN_ATTRIB_PACK__ wlan_ie_ssid_t;
/*-- Supported Rates -----------------------------*/
typedef struct wlan_ie_supp_rates
{
UINT8 eid;
UINT8 len;
UINT8 rates[1]; /* had better be at LEAST one! */
u8 eid;
u8 len;
u8 rates[1]; /* had better be at LEAST one! */
} __WLAN_ATTRIB_PACK__ wlan_ie_supp_rates_t;
/*-- FH Parameter Set ----------------------------*/
typedef struct wlan_ie_fh_parms
{
UINT8 eid;
UINT8 len;
UINT16 dwell;
UINT8 hopset;
UINT8 hoppattern;
UINT8 hopindex;
u8 eid;
u8 len;
u16 dwell;
u8 hopset;
u8 hoppattern;
u8 hopindex;
} __WLAN_ATTRIB_PACK__ wlan_ie_fh_parms_t;
/*-- DS Parameter Set ----------------------------*/
typedef struct wlan_ie_ds_parms
{
UINT8 eid;
UINT8 len;
UINT8 curr_ch;
u8 eid;
u8 len;
u8 curr_ch;
} __WLAN_ATTRIB_PACK__ wlan_ie_ds_parms_t;
/*-- CF Parameter Set ----------------------------*/
typedef struct wlan_ie_cf_parms
{
UINT8 eid;
UINT8 len;
UINT8 cfp_cnt;
UINT8 cfp_period;
UINT16 cfp_maxdur;
UINT16 cfp_durremaining;
u8 eid;
u8 len;
u8 cfp_cnt;
u8 cfp_period;
u16 cfp_maxdur;
u16 cfp_durremaining;
} __WLAN_ATTRIB_PACK__ wlan_ie_cf_parms_t;
/*-- TIM ------------------------------------------*/
typedef struct wlan_ie_tim
{
UINT8 eid;
UINT8 len;
UINT8 dtim_cnt;
UINT8 dtim_period;
UINT8 bitmap_ctl;
UINT8 virt_bm[1];
u8 eid;
u8 len;
u8 dtim_cnt;
u8 dtim_period;
u8 bitmap_ctl;
u8 virt_bm[1];
} __WLAN_ATTRIB_PACK__ wlan_ie_tim_t;
/*-- IBSS Parameter Set ---------------------------*/
typedef struct wlan_ie_ibss_parms
{
UINT8 eid;
UINT8 len;
UINT16 atim_win;
u8 eid;
u8 len;
u16 atim_win;
} __WLAN_ATTRIB_PACK__ wlan_ie_ibss_parms_t;
/*-- Challenge Text ------------------------------*/
typedef struct wlan_ie_challenge
{
UINT8 eid;
UINT8 len;
UINT8 challenge[1];
u8 eid;
u8 len;
u8 challenge[1];
} __WLAN_ATTRIB_PACK__ wlan_ie_challenge_t;
/*-------------------------------------------------*/
......@@ -329,9 +329,9 @@ typedef struct wlan_ie_challenge
/* prototype structure, all mgmt frame types will start with these members */
typedef struct wlan_fr_mgmt
{
UINT16 type;
UINT16 len; /* DOES NOT include CRC !!!!*/
UINT8 *buf;
u16 type;
u16 len; /* DOES NOT include CRC !!!!*/
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
......@@ -342,16 +342,16 @@ typedef struct wlan_fr_mgmt
/*-- Beacon ---------------------------------------*/
typedef struct wlan_fr_beacon
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT64 *ts;
UINT16 *bcn_int;
UINT16 *cap_info;
u64 *ts;
u16 *bcn_int;
u16 *cap_info;
/*-- info elements ----------*/
wlan_ie_ssid_t *ssid;
wlan_ie_supp_rates_t *supp_rates;
......@@ -367,9 +367,9 @@ typedef struct wlan_fr_beacon
/*-- IBSS ATIM ------------------------------------*/
typedef struct wlan_fr_ibssatim
{
UINT16 type;
UINT16 len;
UINT8* buf;
u16 type;
u16 len;
u8* buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
......@@ -384,14 +384,14 @@ typedef struct wlan_fr_ibssatim
/*-- Disassociation -------------------------------*/
typedef struct wlan_fr_disassoc
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT16 *reason;
u16 *reason;
/*-- info elements ----------*/
......@@ -400,15 +400,15 @@ typedef struct wlan_fr_disassoc
/*-- Association Request --------------------------*/
typedef struct wlan_fr_assocreq
{
UINT16 type;
UINT16 len;
UINT8* buf;
u16 type;
u16 len;
u8* buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT16 *cap_info;
UINT16 *listen_int;
u16 *cap_info;
u16 *listen_int;
/*-- info elements ----------*/
wlan_ie_ssid_t *ssid;
wlan_ie_supp_rates_t *supp_rates;
......@@ -418,16 +418,16 @@ typedef struct wlan_fr_assocreq
/*-- Association Response -------------------------*/
typedef struct wlan_fr_assocresp
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT16 *cap_info;
UINT16 *status;
UINT16 *aid;
u16 *cap_info;
u16 *status;
u16 *aid;
/*-- info elements ----------*/
wlan_ie_supp_rates_t *supp_rates;
......@@ -436,16 +436,16 @@ typedef struct wlan_fr_assocresp
/*-- Reassociation Request ------------------------*/
typedef struct wlan_fr_reassocreq
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT16 *cap_info;
UINT16 *listen_int;
UINT8 *curr_ap;
u16 *cap_info;
u16 *listen_int;
u8 *curr_ap;
/*-- info elements ----------*/
wlan_ie_ssid_t *ssid;
wlan_ie_supp_rates_t *supp_rates;
......@@ -455,16 +455,16 @@ typedef struct wlan_fr_reassocreq
/*-- Reassociation Response -----------------------*/
typedef struct wlan_fr_reassocresp
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT16 *cap_info;
UINT16 *status;
UINT16 *aid;
u16 *cap_info;
u16 *status;
u16 *aid;
/*-- info elements ----------*/
wlan_ie_supp_rates_t *supp_rates;
......@@ -473,9 +473,9 @@ typedef struct wlan_fr_reassocresp
/*-- Probe Request --------------------------------*/
typedef struct wlan_fr_probereq
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
......@@ -489,16 +489,16 @@ typedef struct wlan_fr_probereq
/*-- Probe Response -------------------------------*/
typedef struct wlan_fr_proberesp
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT64 *ts;
UINT16 *bcn_int;
UINT16 *cap_info;
u64 *ts;
u16 *bcn_int;
u16 *cap_info;
/*-- info elements ----------*/
wlan_ie_ssid_t *ssid;
wlan_ie_supp_rates_t *supp_rates;
......@@ -511,16 +511,16 @@ typedef struct wlan_fr_proberesp
/*-- Authentication -------------------------------*/
typedef struct wlan_fr_authen
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT16 *auth_alg;
UINT16 *auth_seq;
UINT16 *status;
u16 *auth_alg;
u16 *auth_seq;
u16 *status;
/*-- info elements ----------*/
wlan_ie_challenge_t *challenge;
......@@ -529,14 +529,14 @@ typedef struct wlan_fr_authen
/*-- Deauthenication -----------------------------*/
typedef struct wlan_fr_deauthen
{
UINT16 type;
UINT16 len;
UINT8 *buf;
u16 type;
u16 len;
u8 *buf;
p80211_hdr_t *hdr;
/* used for target specific data, skb in Linux */
void *priv;
/*-- fixed fields -----------*/
UINT16 *reason;
u16 *reason;
/*-- info elements ----------*/
......
drivers/staging/wlan-ng/p80211msg.h
View file @ aaad4303
......@@ -78,17 +78,17 @@
typedef struct p80211msg
{
UINT32 msgcode;
UINT32 msglen;
UINT8 devname[WLAN_DEVNAMELEN_MAX];
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
} __WLAN_ATTRIB_PACK__ p80211msg_t;
typedef struct p80211msgd
{
UINT32 msgcode;
UINT32 msglen;
UINT8 devname[WLAN_DEVNAMELEN_MAX];
UINT8 args[0];
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
u8 args[0];
} __WLAN_ATTRIB_PACK__ p80211msgd_t;
/*================================================================*/
......
drivers/staging/wlan-ng/p80211netdev.c
View file @ aaad4303
......@@ -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_set_mac_address(netdevice_t *dev, void *addr);
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)
struct sk_buff *skb = NULL;
netdevice_t *dev = wlandev->netdev;
p80211_hdr_a3_t *hdr;
UINT16 fc;
u16 fc;
DBFENTER;
......@@ -571,7 +571,7 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev)
static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)
{
UINT32 ethcmd;
u32 ethcmd;
struct ethtool_drvinfo info;
struct ethtool_value edata;
......@@ -638,7 +638,7 @@ static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr)
* -EFAULT memory fault copying msg from user buffer
* -ENOMEM unable to allocate kernel msg buffer
* -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:
* 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)
int result = 0;
p80211ioctl_req_t *req = (p80211ioctl_req_t*)ifr;
wlandevice_t *wlandev = dev->ml_priv;
UINT8 *msgbuf;
u8 *msgbuf;
DBFENTER;
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)
resultcode->data = 0;
/* 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
* change the netdev address
......@@ -1075,10 +1075,10 @@ void p80211netdev_hwremoved(wlandevice_t *wlandev)
* Call context:
* interrupt
----------------------------------------------------------------*/
static int p80211_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)
static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc)
{
UINT16 ftype;
UINT16 fstype;
u16 ftype;
u16 fstype;
int drop = 0;
/* Classify frame, increment counter */
ftype = WLAN_GET_FC_FTYPE(fc);
......
drivers/staging/wlan-ng/p80211netdev.h
View file @ aaad4303
......@@ -113,39 +113,39 @@
/* Received frame statistics */
typedef struct p80211_frmrx_t
{
UINT32 mgmt;
UINT32 assocreq;
UINT32 assocresp;
UINT32 reassocreq;
UINT32 reassocresp;
UINT32 probereq;
UINT32 proberesp;
UINT32 beacon;
UINT32 atim;
UINT32 disassoc;
UINT32 authen;
UINT32 deauthen;
UINT32 mgmt_unknown;
UINT32 ctl;
UINT32 pspoll;
UINT32 rts;
UINT32 cts;
UINT32 ack;
UINT32 cfend;
UINT32 cfendcfack;
UINT32 ctl_unknown;
UINT32 data;
UINT32 dataonly;
UINT32 data_cfack;
UINT32 data_cfpoll;
UINT32 data__cfack_cfpoll;
UINT32 null;
UINT32 cfack;
UINT32 cfpoll;
UINT32 cfack_cfpoll;
UINT32 data_unknown;
UINT32 decrypt;
UINT32 decrypt_err;
u32 mgmt;
u32 assocreq;
u32 assocresp;
u32 reassocreq;
u32 reassocresp;
u32 probereq;
u32 proberesp;
u32 beacon;
u32 atim;
u32 disassoc;
u32 authen;
u32 deauthen;
u32 mgmt_unknown;
u32 ctl;
u32 pspoll;
u32 rts;
u32 cts;
u32 ack;
u32 cfend;
u32 cfendcfack;
u32 ctl_unknown;
u32 data;
u32 dataonly;
u32 data_cfack;
u32 data_cfpoll;
u32 data__cfack_cfpoll;
u32 null;
u32 cfack;
u32 cfpoll;
u32 cfack_cfpoll;
u32 data_unknown;
u32 decrypt;
u32 decrypt_err;
} p80211_frmrx_t;
#ifdef WIRELESS_EXT
......@@ -180,18 +180,18 @@ typedef struct wlandevice
char name[WLAN_DEVNAMELEN_MAX]; /* Dev name, from register_wlandev()*/
char *nsdname;
UINT32 state; /* Device I/F state (open/closed) */
UINT32 msdstate; /* state of underlying driver */
UINT32 hwremoved; /* Has the hw been yanked out? */
u32 state; /* Device I/F state (open/closed) */
u32 msdstate; /* state of underlying driver */
u32 hwremoved; /* Has the hw been yanked out? */
/* Hardware config */
UINT irq;
UINT iobase;
UINT membase;
UINT32 nsdcaps; /* NSD Capabilities flags */
unsigned int irq;
unsigned int iobase;
unsigned int membase;
u32 nsdcaps; /* NSD Capabilities flags */
/* Config vars */
UINT ethconv;
unsigned int ethconv;
/* device methods (init by MSD, used by p80211 */
int (*open)(struct wlandevice *wlandev);
......@@ -204,15 +204,15 @@ typedef struct wlandevice
void (*tx_timeout)(struct wlandevice *wlandev);
/* 802.11 State */
UINT8 bssid[WLAN_BSSID_LEN];
u8 bssid[WLAN_BSSID_LEN];
p80211pstr32_t ssid;
UINT32 macmode;
u32 macmode;
int linkstatus;
int shortpreamble; /* C bool */
/* WEP State */
UINT8 wep_keys[NUM_WEPKEYS][MAX_KEYLEN];
UINT8 wep_keylens[NUM_WEPKEYS];
u8 wep_keys[NUM_WEPKEYS][MAX_KEYLEN];
u8 wep_keylens[NUM_WEPKEYS];
int hostwep;
/* Request/Confirm i/f state (used by p80211) */
......@@ -237,7 +237,7 @@ typedef struct wlandevice
struct iw_statistics wstats;
/* jkriegl: iwspy fields */
UINT8 spy_number;
u8 spy_number;
char spy_address[IW_MAX_SPY][ETH_ALEN];
struct iw_quality spy_stat[IW_MAX_SPY];
......@@ -246,9 +246,9 @@ typedef struct wlandevice
} wlandevice_t;
/* WEP stuff */
int wep_change_key(wlandevice_t *wlandev, int keynum, UINT8* key, int keylen);
int wep_decrypt(wlandevice_t *wlandev, UINT8 *buf, UINT32 len, int key_override, UINT8 *iv, UINT8 *icv);
int wep_encrypt(wlandevice_t *wlandev, UINT8 *buf, UINT8 *dst, UINT32 len, int keynum, UINT8 *iv, UINT8 *icv);
int wep_change_key(wlandevice_t *wlandev, int keynum, u8* key, int keylen);
int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override, u8 *iv, u8 *icv);
int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum, u8 *iv, u8 *icv);
/*================================================================*/
/* Externs */
......
drivers/staging/wlan-ng/p80211req.c
View file @ aaad4303
......@@ -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
* 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;
p80211msg_t *msg = (p80211msg_t*)msgbuf;
......@@ -223,13 +223,13 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
{
p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data;
p80211pstrd_t *pstr = (p80211pstrd_t*) mibitem->data;
UINT8 *key = mibitem->data + sizeof(p80211pstrd_t);
u8 *key = mibitem->data + sizeof(p80211pstrd_t);
DBFENTER;
switch (mibitem->did) {
case DIDmib_dot11smt_p80211Table_p80211_ifstate: {
UINT32 *data = (UINT32 *) mibitem->data;
u32 *data = (u32 *) mibitem->data;
if (isget)
switch (wlandev->msdstate) {
case WLAN_MSD_HWPRESENT:
......@@ -247,7 +247,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
break;
}
case DIDmib_dot11phy_dot11PhyOperationTable_dot11ShortPreambleEnabled: {
UINT32 *data = (UINT32 *) mibitem->data;
u32 *data = (u32 *) mibitem->data;
if (isget)
*data = wlandev->shortpreamble;
......@@ -276,7 +276,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
break;
}
case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID: {
UINT32 *data = (UINT32 *) mibitem->data;
u32 *data = (u32 *) mibitem->data;
if (isget) {
*data = wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK;
......@@ -288,7 +288,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
break;
}
case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked: {
UINT32 *data = (UINT32 *) mibitem->data;
u32 *data = (u32 *) mibitem->data;
if (isget) {
if (wlandev->hostwep & HOSTWEP_PRIVACYINVOKED)
......@@ -303,7 +303,7 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
break;
}
case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted: {
UINT32 *data = (UINT32 *) mibitem->data;
u32 *data = (u32 *) mibitem->data;
if (isget) {
if (wlandev->hostwep & HOSTWEP_EXCLUDEUNENCRYPTED)
......
drivers/staging/wlan-ng/p80211req.h
View file @ aaad4303
......@@ -63,6 +63,6 @@
/*================================================================*/
/* Function Declarations */
int p80211req_dorequest(wlandevice_t *wlandev, UINT8 *msgbuf);
int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf);
#endif
drivers/staging/wlan-ng/p80211types.h
View file @ aaad4303
......@@ -80,13 +80,13 @@
#define P80211_TYPE_OCTETSTR 1 /* pascal array of bytes */
#define P80211_TYPE_DISPLAYSTR 2 /* pascal array of bytes containing ascii */
#define P80211_TYPE_INT 4 /* UINT32 min and max limited by 32 bits */
#define P80211_TYPE_ENUMINT 5 /* UINT32 holding a numeric
#define P80211_TYPE_int 4 /* u32 min and max limited by 32 bits */
#define P80211_TYPE_ENUMint 5 /* u32 holding a numeric
code that can be mapped
to a textual name */
#define P80211_TYPE_UNKDATA 6 /* Data item containing an
unknown data type */
#define P80211_TYPE_INTARRAY 7 /* Array of 32-bit integers. */
#define P80211_TYPE_intARRAY 7 /* Array of 32-bit integers. */
#define P80211_TYPE_BITARRAY 8 /* Array of bits. */
#define P80211_TYPE_MACARRAY 9 /* Array of MAC addresses. */
......@@ -243,7 +243,7 @@
/* is a DID-LEN-DATA triple */
/* with a max size of 4+4+384 */
#define P80211_SET_INT(item, value) do { \
#define P80211_SET_int(item, value) do { \
(item).data = (value); \
(item).status = P80211ENUM_msgitem_status_data_ok; \
} while(0)
......@@ -279,9 +279,9 @@
#define P80211ITEM_SETFLAGS(q, r, c) ( q | r | c )
#define P80211ITEM_ISREQUIRED(flags) (((UINT32)(flags & ISREQUIRED)) >> 31 )
#define P80211ITEM_ISREQUEST(flags) (((UINT32)(flags & ISREQUEST)) >> 30 )
#define P80211ITEM_ISCONFIRM(flags) (((UINT32)(flags & ISCONFIRM)) >> 29 )
#define P80211ITEM_ISREQUIRED(flags) (((u32)(flags & ISREQUIRED)) >> 31 )
#define P80211ITEM_ISREQUEST(flags) (((u32)(flags & ISREQUEST)) >> 30 )
#define P80211ITEM_ISCONFIRM(flags) (((u32)(flags & ISCONFIRM)) >> 29 )
/*----------------------------------------------------------------*/
/* The following macro creates a name for an enum */
......@@ -320,7 +320,7 @@
#define P80211DID_MASK_ACCESS (0x00000003UL)
#define P80211DID_MK(a,m,l) ((((UINT32)(a)) & (m)) << (l))
#define P80211DID_MK(a,m,l) ((((u32)(a)) & (m)) << (l))
#define P80211DID_MKSECTION(a) P80211DID_MK(a, \
P80211DID_MASK_SECTION, \
......@@ -347,7 +347,7 @@
(a) )
#define P80211DID_GET(a,m,l) ((((UINT32)(a)) >> (l)) & (m))
#define P80211DID_GET(a,m,l) ((((u32)(a)) >> (l)) & (m))
#define P80211DID_SECTION(a) P80211DID_GET(a, \
P80211DID_MASK_SECTION, \
......@@ -373,17 +373,17 @@
/*----------------------------------------------------------------*/
/* The following structure types are used for the represenation */
/* of ENUMINT type metadata. */
/* of ENUMint type metadata. */
typedef struct p80211enumpair
{
UINT32 val;
u32 val;
char *name;
} p80211enumpair_t;
typedef struct p80211enum
{
INT nitems;
int nitems;
p80211enumpair_t *list;
} p80211enum_t;
......@@ -394,137 +394,137 @@ typedef struct p80211enum
/* Template pascal string */
typedef struct p80211pstr
{
UINT8 len;
u8 len;
} __WLAN_ATTRIB_PACK__ p80211pstr_t;
typedef struct p80211pstrd
{
UINT8 len;
UINT8 data[0];
u8 len;
u8 data[0];
} __WLAN_ATTRIB_PACK__ p80211pstrd_t;
/* Maximum pascal string */
typedef struct p80211pstr255
{
UINT8 len;
UINT8 data[MAXLEN_PSTR255];
u8 len;
u8 data[MAXLEN_PSTR255];
} __WLAN_ATTRIB_PACK__ p80211pstr255_t;
/* pascal string for macaddress and bssid */
typedef struct p80211pstr6
{
UINT8 len;
UINT8 data[MAXLEN_PSTR6];
u8 len;
u8 data[MAXLEN_PSTR6];
} __WLAN_ATTRIB_PACK__ p80211pstr6_t;
/* pascal string for channel list */
typedef struct p80211pstr14
{
UINT8 len;
UINT8 data[MAXLEN_PSTR14];
u8 len;
u8 data[MAXLEN_PSTR14];
} __WLAN_ATTRIB_PACK__ p80211pstr14_t;
/* pascal string for ssid */
typedef struct p80211pstr32
{
UINT8 len;
UINT8 data[MAXLEN_PSTR32];
u8 len;
u8 data[MAXLEN_PSTR32];
} __WLAN_ATTRIB_PACK__ p80211pstr32_t;
/* MAC address array */
typedef struct p80211macarray
{
UINT32 cnt;
UINT8 data[1][MAXLEN_PSTR6];
u32 cnt;
u8 data[1][MAXLEN_PSTR6];
} __WLAN_ATTRIB_PACK__ p80211macarray_t;
/* prototype template */
typedef struct p80211item
{
UINT32 did;
UINT16 status;
UINT16 len;
u32 did;
u16 status;
u16 len;
} __WLAN_ATTRIB_PACK__ p80211item_t;
/* prototype template w/ data item */
typedef struct p80211itemd
{
UINT32 did;
UINT16 status;
UINT16 len;
UINT8 data[0];
u32 did;
u16 status;
u16 len;
u8 data[0];
} __WLAN_ATTRIB_PACK__ p80211itemd_t;
/* message data item for INT, BOUNDEDINT, ENUMINT */
/* message data item for int, BOUNDEDINT, ENUMINT */
typedef struct p80211item_uint32
{
UINT32 did;
UINT16 status;
UINT16 len;
UINT32 data;
u32 did;
u16 status;
u16 len;
u32 data;
} __WLAN_ATTRIB_PACK__ p80211item_uint32_t;
/* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr6
{
UINT32 did;
UINT16 status;
UINT16 len;
u32 did;
u16 status;
u16 len;
p80211pstr6_t data;
} __WLAN_ATTRIB_PACK__ p80211item_pstr6_t;
/* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr14
{
UINT32 did;
UINT16 status;
UINT16 len;
u32 did;
u16 status;
u16 len;
p80211pstr14_t data;
} __WLAN_ATTRIB_PACK__ p80211item_pstr14_t;
/* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr32
{
UINT32 did;
UINT16 status;
UINT16 len;
u32 did;
u16 status;
u16 len;
p80211pstr32_t data;
} __WLAN_ATTRIB_PACK__ p80211item_pstr32_t;
/* message data item for OCTETSTR, DISPLAYSTR */
typedef struct p80211item_pstr255
{
UINT32 did;
UINT16 status;
UINT16 len;
u32 did;
u16 status;
u16 len;
p80211pstr255_t data;
} __WLAN_ATTRIB_PACK__ p80211item_pstr255_t;
/* message data item for UNK 392, namely mib items */
typedef struct p80211item_unk392
{
UINT32 did;
UINT16 status;
UINT16 len;
UINT8 data[MAXLEN_MIBATTRIBUTE];
u32 did;
u16 status;
u16 len;
u8 data[MAXLEN_MIBATTRIBUTE];
} __WLAN_ATTRIB_PACK__ p80211item_unk392_t;
/* message data item for UNK 1025, namely p2 pdas */
typedef struct p80211item_unk1024
{
UINT32 did;
UINT16 status;
UINT16 len;
UINT8 data[1024];
u32 did;
u16 status;
u16 len;
u8 data[1024];
} __WLAN_ATTRIB_PACK__ p80211item_unk1024_t;
/* message data item for UNK 4096, namely p2 download chunks */
typedef struct p80211item_unk4096
{
UINT32 did;
UINT16 status;
UINT16 len;
UINT8 data[4096];
u32 did;
u16 status;
u16 len;
u8 data[4096];
} __WLAN_ATTRIB_PACK__ p80211item_unk4096_t;
struct catlistitem;
......@@ -534,9 +534,9 @@ struct catlistitem;
/* metadata items. Some components may choose to use more, */
/* less or different metadata items. */
typedef void (*p80211_totext_t)( struct catlistitem *, UINT32 did, UINT8* itembuf, char *textbuf);
typedef void (*p80211_fromtext_t)( struct catlistitem *, UINT32 did, UINT8* itembuf, char *textbuf);
typedef UINT32 (*p80211_valid_t)( struct catlistitem *, UINT32 did, UINT8* itembuf);
typedef void (*p80211_totext_t)( struct catlistitem *, u32 did, u8* itembuf, char *textbuf);
typedef void (*p80211_fromtext_t)( struct catlistitem *, u32 did, u8* itembuf, char *textbuf);
typedef u32 (*p80211_valid_t)( struct catlistitem *, u32 did, u8* itembuf);
/*================================================================*/
......@@ -575,8 +575,8 @@ extern p80211enum_t MKENUMNAME(p2preamble);
/* The following declare some utility functions for use with the */
/* p80211enum_t type. */
UINT32 p80211enum_text2int(p80211enum_t *ep, char *text);
UINT32 p80211enum_int2text(p80211enum_t *ep, UINT32 val, char *text);
u32 p80211enum_text2int(p80211enum_t *ep, char *text);
u32 p80211enum_int2text(p80211enum_t *ep, u32 val, char *text);
void p80211_error2text(int err_code, char *err_str);
/*----------------------------------------------------------------*/
......@@ -591,85 +591,85 @@ void p80211_error2text(int err_code, char *err_str);
/*-- DISPLAYSTR ------------------------------------------------------*/
/* pstr ==> cstr */
void p80211_totext_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_totext_displaystr( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* cstr ==> pstr */
void p80211_fromtext_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_fromtext_displaystr( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* function that checks validity of a displaystr binary value */
UINT32 p80211_isvalid_displaystr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
u32 p80211_isvalid_displaystr( struct catlistitem *metalist, u32 did, u8 *itembuf );
/*-- OCTETSTR --------------------------------------------------------*/
/* pstr ==> "xx:xx:...." */
void p80211_totext_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_totext_octetstr( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* "xx:xx:...." ==> pstr */
void p80211_fromtext_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_fromtext_octetstr( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* function that checks validity of an octetstr binary value */
UINT32 p80211_isvalid_octetstr( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
u32 p80211_isvalid_octetstr( struct catlistitem *metalist, u32 did, u8 *itembuf );
/*-- INT -------------------------------------------------------------*/
/* UINT32 ==> %d */
void p80211_totext_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
/*-- int -------------------------------------------------------------*/
/* u32 ==> %d */
void p80211_totext_int( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* %d ==> UINT32 */
void p80211_fromtext_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
/* %d ==> u32 */
void p80211_fromtext_int( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* function that checks validity of an int's binary value (always successful) */
UINT32 p80211_isvalid_int( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
u32 p80211_isvalid_int( struct catlistitem *metalist, u32 did, u8 *itembuf );
/*-- ENUMINT ---------------------------------------------------------*/
/* UINT32 ==> <valuename> */
void p80211_totext_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
/*-- ENUMint ---------------------------------------------------------*/
/* u32 ==> <valuename> */
void p80211_totext_enumint( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* <valuename> ==> UINT32 */
void p80211_fromtext_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
/* <valuename> ==> u32 */
void p80211_fromtext_enumint( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* function that checks validity of an enum's binary value */
UINT32 p80211_isvalid_enumint( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
u32 p80211_isvalid_enumint( struct catlistitem *metalist, u32 did, u8 *itembuf );
/*-- INTARRAY --------------------------------------------------------*/
/* UINT32[] => %d,%d,%d,... */
void p80211_totext_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
/*-- intARRAY --------------------------------------------------------*/
/* u32[] => %d,%d,%d,... */
void p80211_totext_intarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* %d,%d,%d,... ==> UINT32[] */
void p80211_fromtext_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
/* %d,%d,%d,... ==> u32[] */
void p80211_fromtext_intarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* function that checks validity of an integer array's value */
UINT32 p80211_isvalid_intarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
u32 p80211_isvalid_intarray( struct catlistitem *metalist, u32 did, u8 *itembuf );
/*-- BITARRAY --------------------------------------------------------*/
/* UINT32 ==> %d,%d,%d,... */
void p80211_totext_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
/* u32 ==> %d,%d,%d,... */
void p80211_totext_bitarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* %d,%d,%d,... ==> UINT32 */
void p80211_fromtext_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
/* %d,%d,%d,... ==> u32 */
void p80211_fromtext_bitarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* function that checks validity of a bit array's value */
UINT32 p80211_isvalid_bitarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
u32 p80211_isvalid_bitarray( struct catlistitem *metalist, u32 did, u8 *itembuf );
/*-- MACARRAY --------------------------------------------------------*/
void p80211_totext_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_totext_macarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
void p80211_fromtext_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_fromtext_macarray( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* function that checks validity of a MAC address array's value */
UINT32 p80211_isvalid_macarray( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
u32 p80211_isvalid_macarray( struct catlistitem *metalist, u32 did, u8 *itembuf );
/*-- MIBATTRIUBTE ------------------------------------------------------*/
/* <mibvalue> ==> <textual representation identified in MIB metadata> */
void p80211_totext_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_totext_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_totext_getmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
void p80211_totext_setmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* <textual representation identified in MIB metadata> ==> <mibvalue> */
void p80211_fromtext_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_fromtext_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf, char *textbuf );
void p80211_fromtext_getmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
void p80211_fromtext_setmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf, char *textbuf );
/* function that checks validity of a mibitem's binary value */
UINT32 p80211_isvalid_getmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
UINT32 p80211_isvalid_setmibattribute( struct catlistitem *metalist, UINT32 did, UINT8 *itembuf );
u32 p80211_isvalid_getmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf );
u32 p80211_isvalid_setmibattribute( struct catlistitem *metalist, u32 did, u8 *itembuf );
#endif /* _P80211TYPES_H */
drivers/staging/wlan-ng/p80211wep.c
View file @ aaad4303
......@@ -72,7 +72,7 @@
/*================================================================*/
/* Local Constants */
#define SSWAP(a,b) {UINT8 tmp = s[a]; s[a] = s[b]; s[b] = tmp;}
#define SSWAP(a,b) {u8 tmp = s[a]; s[a] = s[b]; s[b] = tmp;}
#define WEP_KEY(x) (((x) & 0xC0) >> 6)
/*================================================================*/
......@@ -86,7 +86,7 @@
/*================================================================*/
/* Local Static Definitions */
static const UINT32 wep_crc32_table[256] = {
static const u32 wep_crc32_table[256] = {
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
......@@ -149,7 +149,7 @@ static const UINT32 wep_crc32_table[256] = {
/* keylen in bytes! */
int wep_change_key(wlandevice_t *wlandev, int keynum, UINT8* key, int keylen)
int wep_change_key(wlandevice_t *wlandev, int keynum, u8* key, int keylen)
{
if (keylen < 0) return -1;
if (keylen >= MAX_KEYLEN) return -1;
......@@ -172,11 +172,11 @@ int wep_change_key(wlandevice_t *wlandev, int keynum, UINT8* key, int keylen)
4-byte IV at start of buffer, 4-byte ICV at end of buffer.
if successful, buf start is payload begin, length -= 8;
*/
int wep_decrypt(wlandevice_t *wlandev, UINT8 *buf, UINT32 len, int key_override, UINT8 *iv, UINT8 *icv)
int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override, u8 *iv, u8 *icv)
{
UINT32 i, j, k, crc, keylen;
UINT8 s[256], key[64], c_crc[4];
UINT8 keyidx;
u32 i, j, k, crc, keylen;
u8 s[256], key[64], c_crc[4];
u8 keyidx;
/* Needs to be at least 8 bytes of payload */
if (len <= 0) return -1;
......@@ -244,10 +244,10 @@ int wep_decrypt(wlandevice_t *wlandev, UINT8 *buf, UINT32 len, int key_override,
}
/* encrypts in-place. */
int wep_encrypt(wlandevice_t *wlandev, UINT8 *buf, UINT8 *dst, UINT32 len, int keynum, UINT8 *iv, UINT8 *icv)
int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum, u8 *iv, u8 *icv)
{
UINT32 i, j, k, crc, keylen;
UINT8 s[256], key[64];
u32 i, j, k, crc, keylen;
u8 s[256], key[64];
/* no point in WEPping an empty frame */
if (len <= 0) return -1;
......
drivers/staging/wlan-ng/p80211wext.c
View file @ aaad4303
......@@ -78,7 +78,7 @@ static int p80211wext_giwessid(netdevice_t *dev,
/* compatibility to wireless extensions */
#ifdef WIRELESS_EXT
static UINT8 p80211_mhz_to_channel(UINT16 mhz)
static u8 p80211_mhz_to_channel(u16 mhz)
{
if (mhz >= 5000) {
return ((mhz - 5000) / 5);
......@@ -94,7 +94,7 @@ static UINT8 p80211_mhz_to_channel(UINT16 mhz)
return 0;
}
static UINT16 p80211_channel_to_mhz(UINT8 ch, int dot11a)
static u16 p80211_channel_to_mhz(u8 ch, int dot11a)
{
if (ch == 0)
......@@ -144,7 +144,7 @@ static int qual_as_percent(int snr ) {
static int p80211wext_dorequest(wlandevice_t *wlandev, UINT32 did, UINT32 data)
static int p80211wext_dorequest(wlandevice_t *wlandev, u32 did, u32 data)
{
p80211msg_dot11req_mibset_t msg;
p80211item_uint32_t mibitem;
......@@ -156,7 +156,7 @@ static int p80211wext_dorequest(wlandevice_t *wlandev, UINT32 did, UINT32 data)
mibitem.did = did;
mibitem.data = data;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
DBFEXIT;
return result;
......@@ -197,7 +197,7 @@ static int p80211wext_autojoin(wlandevice_t *wlandev)
memcpy(msg.ssid.data.data, ssid, data.length);
msg.ssid.data.len = data.length;
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -303,7 +303,7 @@ static int p80211wext_giwfreq(netdevice_t *dev,
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem.did = DIDmib_dot11phy_dot11PhyDSSSTable_dot11CurrentChannel;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -353,7 +353,7 @@ static int p80211wext_siwfreq(netdevice_t *dev,
mibitem.data = p80211_mhz_to_channel(freq->m);
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -436,14 +436,11 @@ static int p80211wext_siwmode(netdevice_t *dev,
}
/* Set Operation mode to the PORT TYPE RID */
#warning "get rid of p2mib here"
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem.did = DIDmib_p2_p2Static_p2CnfPortType;
mibitem.data = (*mode == IW_MODE_ADHOC) ? 0 : 1;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result)
err = -EFAULT;
......@@ -671,7 +668,7 @@ static int p80211wext_siwencode(netdevice_t *dev,
msg.msgcode = DIDmsg_dot11req_mibset;
memcpy(&msg.mibattribute.data, &pstr, sizeof(pstr));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -779,7 +776,7 @@ static int p80211wext_siwessid(netdevice_t *dev,
msg.ssid.data.len = length;
WLAN_LOG_DEBUG(1,"autojoin_ssid for %s \n",essid);
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
WLAN_LOG_DEBUG(1,"autojoin_ssid %d\n",result);
if (result) {
......@@ -831,7 +828,7 @@ static int p80211wext_giwrate(netdevice_t *dev,
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem.did = DIDmib_p2_p2MAC_p2CurrentTxRate;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -844,10 +841,10 @@ static int p80211wext_giwrate(netdevice_t *dev,
rrq->disabled = 0;
rrq->value = 0;
#define HFA384x_RATEBIT_1 ((UINT16)1)
#define HFA384x_RATEBIT_2 ((UINT16)2)
#define HFA384x_RATEBIT_5dot5 ((UINT16)4)
#define HFA384x_RATEBIT_11 ((UINT16)8)
#define HFA384x_RATEBIT_1 ((u16)1)
#define HFA384x_RATEBIT_2 ((u16)2)
#define HFA384x_RATEBIT_5dot5 ((u16)4)
#define HFA384x_RATEBIT_11 ((u16)8)
switch (mibitem.data) {
case HFA384x_RATEBIT_1:
......@@ -885,7 +882,7 @@ static int p80211wext_giwrts(netdevice_t *dev,
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -929,7 +926,7 @@ static int p80211wext_siwrts(netdevice_t *dev,
mibitem.data = rts->value;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -956,7 +953,7 @@ static int p80211wext_giwfrag(netdevice_t *dev,
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1000,7 +997,7 @@ static int p80211wext_siwfrag(netdevice_t *dev,
mibitem.data = frag->value;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1029,7 +1026,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
p80211msg_dot11req_mibset_t msg;
int result;
int err = 0;
UINT16 shortretry, longretry, lifetime;
u16 shortretry, longretry, lifetime;
DBFENTER;
......@@ -1037,7 +1034,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11ShortRetryLimit;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1051,7 +1048,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11LongRetryLimit;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1065,7 +1062,7 @@ static int p80211wext_giwretry(netdevice_t *dev,
mibitem.did = DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1128,7 +1125,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
mibitem.data = rrq->value /= 1024;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1140,7 +1137,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
mibitem.data = rrq->value;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1153,7 +1150,7 @@ static int p80211wext_siwretry(netdevice_t *dev,
mibitem.data = rrq->value;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1201,7 +1198,7 @@ static int p80211wext_siwtxpow(netdevice_t *dev,
}
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1229,7 +1226,7 @@ static int p80211wext_giwtxpow(netdevice_t *dev,
mibitem.did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
memcpy(&msg.mibattribute.data, &mibitem, sizeof(mibitem));
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result) {
err = -EFAULT;
......@@ -1381,7 +1378,7 @@ static int p80211wext_siwscan(netdevice_t *dev,
msg.maxchanneltime.data = 250;
msg.minchanneltime.data = 200;
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if (result)
err = prism2_result2err (msg.resultcode.data);
......@@ -1492,7 +1489,7 @@ static int p80211wext_giwscan(netdevice_t *dev,
msg.msgcode = DIDmsg_dot11req_scan_results;
msg.bssindex.data = i;
result = p80211req_dorequest(wlandev, (UINT8*)&msg);
result = p80211req_dorequest(wlandev, (u8*)&msg);
if ((result != 0) ||
(msg.resultcode.data != P80211ENUM_resultcode_success)) {
break;
......@@ -1585,7 +1582,7 @@ static int p80211wext_set_encodeext(struct net_device *dev,
break;
}
msg.msgcode = DIDmsg_dot11req_mibset;
result = p80211req_dorequest(wlandev,(UINT8*)&msg);
result = p80211req_dorequest(wlandev,(u8*)&msg);
WLAN_LOG_DEBUG(1,"result (%d)\n",result);
}
return result;
......
drivers/staging/wlan-ng/prism2mgmt.c
View file @ aaad4303
......@@ -129,7 +129,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
int result = 0;
hfa384x_t *hw = wlandev->priv;
p80211msg_dot11req_scan_t *msg = msgp;
UINT16 roamingmode, word;
u16 roamingmode, word;
int i, timeout;
int istmpenable = 0;
......@@ -197,7 +197,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
/* set up the channel list */
word = 0;
for (i = 0; i < msg->channellist.data.len; i++) {
UINT8 channel = msg->channellist.data.data[i];
u8 channel = msg->channellist.data.data[i];
if (channel > 14) continue;
/* channel 1 is BIT0 ... channel 14 is BIT13 */
word |= (1 << (channel-1));
......@@ -218,7 +218,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
goto exit;
}
if (word == HFA384x_PORTSTATUS_DISABLED) {
UINT16 wordbuf[17];
u16 wordbuf[17];
result = hfa384x_drvr_setconfig16(hw,
HFA384x_RID_CNFROAMINGMODE,
......@@ -531,9 +531,9 @@ int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp)
int result = 0;
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_join_t *msg = msgp;
UINT16 reg;
u16 reg;
p80211pstrd_t *pstr;
UINT8 bytebuf[256];
u8 bytebuf[256];
hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
hfa384x_JoinRequest_data_t joinreq;
DBFENTER;
......@@ -828,9 +828,9 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
p80211msg_dot11req_start_t *msg = msgp;
p80211pstrd_t *pstr;
UINT8 bytebuf[80];
u8 bytebuf[80];
hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
UINT16 word;
u16 word;
DBFENTER;
wlandev->macmode = WLAN_MACMODE_NONE;
......@@ -876,7 +876,7 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
/* beacon period */
word = msg->beaconperiod.data;
result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNINT, word);
result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAPBCNint, word);
if ( result ) {
WLAN_LOG_ERROR("Failed to set beacon period=%d.\n", word);
goto failed;
......@@ -1214,16 +1214,16 @@ int prism2mgmt_low_level(wlandevice_t *wlandev, void *msgp)
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
/* call some routine to execute the test command */
cmd.cmd = (UINT16) msg->command.data;
cmd.parm0 = (UINT16) msg->param0.data;
cmd.parm1 = (UINT16) msg->param1.data;
cmd.parm2 = (UINT16) msg->param2.data;
cmd.cmd = (u16) msg->command.data;
cmd.parm0 = (u16) msg->param0.data;
cmd.parm1 = (u16) msg->param1.data;
cmd.parm2 = (u16) msg->param2.data;
hfa384x_drvr_low_level(hw,&cmd);
msg->resp0.data = (UINT32) cmd.result.resp0;
msg->resp1.data = (UINT32) cmd.result.resp1;
msg->resp2.data = (UINT32) cmd.result.resp2;
msg->resp0.data = (u32) cmd.result.resp0;
msg->resp1.data = (u32) cmd.result.resp1;
msg->resp2.data = (u32) cmd.result.resp2;
msg->resultcode.data = P80211ENUM_resultcode_success;
......@@ -1257,8 +1257,8 @@ int prism2mgmt_test_command(wlandevice_t *wlandev, void *msgp)
DBFENTER;
cmd.cmd = ((UINT16) msg->testcode.data) << 8 | 0x38;
cmd.parm0 = (UINT16) msg->testparam.data;
cmd.cmd = ((u16) msg->testcode.data) << 8 | 0x38;
cmd.parm0 = (u16) msg->testparam.data;
cmd.parm1 = 0;
cmd.parm2 = 0;
......@@ -1305,7 +1305,7 @@ int prism2mgmt_mmi_read(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_mmi_read_t *msg = msgp;
UINT32 resp = 0;
u32 resp = 0;
DBFENTER;
......@@ -1450,9 +1450,9 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_ramdl_write_t *msg = msgp;
UINT32 addr;
UINT32 len;
UINT8 *buf;
u32 addr;
u32 len;
u8 *buf;
DBFENTER;
if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
......@@ -1590,9 +1590,9 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_flashdl_write_t *msg = msgp;
UINT32 addr;
UINT32 len;
UINT8 *buf;
u32 addr;
u32 len;
u8 *buf;
DBFENTER;
if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
......@@ -1691,11 +1691,11 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
int result = 0;
UINT16 reg;
UINT16 port_type;
u16 reg;
u16 port_type;
p80211msg_lnxreq_autojoin_t *msg = msgp;
p80211pstrd_t *pstr;
UINT8 bytebuf[256];
u8 bytebuf[256];
hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
DBFENTER;
......@@ -1785,7 +1785,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
p80211msg_lnxreq_wlansniff_t *msg = msgp;
hfa384x_t *hw = wlandev->priv;
UINT16 word;
u16 word;
DBFENTER;
......
drivers/staging/wlan-ng/prism2mgmt.h
View file @ aaad4303
......@@ -80,8 +80,8 @@ extern int prism2_reset_settletime;
/*--- Function Declarations -----------------------------------*/
/*=============================================================*/
UINT32
prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate);
u32
prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate);
void
prism2sta_ev_dtim(wlandevice_t *wlandev);
......@@ -90,9 +90,9 @@ prism2sta_ev_infdrop(wlandevice_t *wlandev);
void
prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf);
void
prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status);
prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status);
void
prism2sta_ev_tx(wlandevice_t *wlandev, UINT16 status);
prism2sta_ev_tx(wlandevice_t *wlandev, u16 status);
void
prism2sta_ev_rx(wlandevice_t *wlandev, struct sk_buff *skb);
void
......@@ -129,31 +129,31 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp);
* Prism2 data types
---------------------------------------------------------------*/
/* byte area conversion functions*/
void prism2mgmt_pstr2bytearea(UINT8 *bytearea, p80211pstrd_t *pstr);
void prism2mgmt_bytearea2pstr(UINT8 *bytearea, p80211pstrd_t *pstr, int len);
void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr);
void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len);
/* byte string conversion functions*/
void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr);
void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr);
/* integer conversion functions */
void prism2mgmt_prism2int2p80211int(UINT16 *prism2int, UINT32 *wlanint);
void prism2mgmt_p80211int2prism2int(UINT16 *prism2int, UINT32 *wlanint);
void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint);
void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint);
/* enumerated integer conversion functions */
void prism2mgmt_prism2enum2p80211enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid);
void prism2mgmt_p80211enum2prism2enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid);
void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid);
void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid);
/* functions to convert a bit area to/from an Operational Rate Set */
void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr);
void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr);
void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr);
void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr);
/* functions to convert Group Addresses */
void prism2mgmt_get_grpaddr(UINT32 did,
void prism2mgmt_get_grpaddr(u32 did,
p80211pstrd_t *pstr, hfa384x_t *priv );
int prism2mgmt_set_grpaddr(UINT32 did,
UINT8 *prism2buf, p80211pstrd_t *pstr, hfa384x_t *priv );
int prism2mgmt_get_grpaddr_index( UINT32 did );
int prism2mgmt_set_grpaddr(u32 did,
u8 *prism2buf, p80211pstrd_t *pstr, hfa384x_t *priv );
int prism2mgmt_get_grpaddr_index( u32 did );
void prism2sta_processing_defer(struct work_struct *data);
......
drivers/staging/wlan-ng/prism2mib.c
View file @ aaad4303
......@@ -96,11 +96,11 @@
typedef struct mibrec
{
UINT32 did;
UINT16 flag;
UINT16 parm1;
UINT16 parm2;
UINT16 parm3;
u32 did;
u16 flag;
u16 parm1;
u16 parm2;
u16 parm3;
int (*func)(struct mibrec *mib,
int isget,
wlandevice_t *wlandev,
......@@ -909,7 +909,7 @@ static mibrec_t mibtab[] = {
prism2mib_uint32 },
{ DIDmib_p2_p2MAC_p2CurrentBeaconInterval,
F_STA | F_READ,
HFA384x_RID_CURRENTBCNINT, 0, 0,
HFA384x_RID_CURRENTBCNint, 0, 0,
prism2mib_uint32 },
{ DIDmib_p2_p2MAC_p2StaCurrentScaleThresholds,
F_STA | F_READ,
......@@ -1103,7 +1103,7 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
int result, isget;
mibrec_t *mib;
UINT16 which;
u16 which;
p80211msg_dot11req_mibset_t *msg = msgp;
p80211itemd_t *mibitem;
......@@ -1227,7 +1227,7 @@ void *data)
{
int result;
p80211pstrd_t *pstr = (p80211pstrd_t*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
u8 bytebuf[MIB_TMP_MAXLEN];
hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*) bytebuf;
DBFENTER;
......@@ -1280,7 +1280,7 @@ void *data)
{
int result;
p80211pstrd_t *pstr = (p80211pstrd_t*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
u8 bytebuf[MIB_TMP_MAXLEN];
DBFENTER;
......@@ -1331,9 +1331,9 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 *wordbuf = (UINT16*) bytebuf;
u32 *uint32 = (u32*) data;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf;
DBFENTER;
......@@ -1389,14 +1389,14 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32 *) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 *wordbuf = (UINT16*) bytebuf;
u32 *uint32 = (u32 *) data;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf;
int i, cnt;
DBFENTER;
cnt = mib->parm2 / sizeof(UINT16);
cnt = mib->parm2 / sizeof(u16);
if (isget) {
result = hfa384x_drvr_getconfig(hw, mib->parm1, wordbuf, mib->parm2);
......@@ -1446,14 +1446,14 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 *wordbuf = (UINT16*) bytebuf;
UINT16 cnt;
u32 *uint32 = (u32*) data;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf;
u16 cnt;
DBFENTER;
cnt = mib->parm2 / sizeof(UINT16);
cnt = mib->parm2 / sizeof(u16);
result = hfa384x_drvr_getconfig(hw, mib->parm1, wordbuf, mib->parm2);
if (result == 0) {
......@@ -1508,9 +1508,9 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 *wordbuf = (UINT16*) bytebuf;
u32 *uint32 = (u32*) data;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf;
DBFENTER;
......@@ -1561,10 +1561,10 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 *wordbuf = (UINT16*) bytebuf;
UINT32 flags;
u32 *uint32 = (u32*) data;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf;
u32 flags;
DBFENTER;
......@@ -1628,10 +1628,10 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 cnt;
u32 cnt;
p80211pstrd_t *pstr = (p80211pstrd_t*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 *wordbuf = (UINT16*) bytebuf;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf;
DBFENTER;
......@@ -1640,7 +1640,7 @@ void *data)
if (isget) {
result = hfa384x_drvr_getconfig(hw, mib->parm1, wordbuf, mib->parm2);
prism2mgmt_prism2int2p80211int(wordbuf, &cnt);
pstr->len = (UINT8) cnt;
pstr->len = (u8) cnt;
memcpy(pstr->data, &wordbuf[1], pstr->len);
}
......@@ -1683,8 +1683,8 @@ void *data)
{
int result;
p80211pstrd_t *pstr = (p80211pstrd_t*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 len;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 len;
DBFENTER;
......@@ -1741,8 +1741,8 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32*) data;
UINT32 value;
u32 *uint32 = (u32*) data;
u32 value;
DBFENTER;
......@@ -1792,9 +1792,9 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32*) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 *wordbuf = (UINT16*) bytebuf;
u32 *uint32 = (u32*) data;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf;
DBFENTER;
......@@ -1937,7 +1937,7 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32*) data;
u32 *uint32 = (u32*) data;
DBFENTER;
......@@ -1990,8 +1990,8 @@ void *data)
{
int result;
p80211pstrd_t *pstr = (p80211pstrd_t *) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 *wordbuf = (UINT16*) bytebuf;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf;
DBFENTER;
......@@ -2043,8 +2043,8 @@ void *data)
{
int result;
p80211pstrd_t *pstr = (p80211pstrd_t *) data;
UINT8 bytebuf[MIB_TMP_MAXLEN];
UINT16 len;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 len;
DBFENTER;
......@@ -2188,7 +2188,7 @@ hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data)
{
UINT32 *uint32 = (UINT32*) data;
u32 *uint32 = (u32*) data;
DBFENTER;
......@@ -2252,11 +2252,11 @@ p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
UINT32 *uint32 = (UINT32*) data;
u32 *uint32 = (u32*) data;
int index;
UINT16 cnf_auth;
UINT16 mask;
u16 cnf_auth;
u16 mask;
DBFENTER;
......@@ -2331,7 +2331,7 @@ hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data)
{
UINT32 *uint32 = (UINT32*) data;
u32 *uint32 = (u32*) data;
p80211pstrd_t *pstr = (p80211pstrd_t*) data;
int i, cnt, result;
......@@ -2341,7 +2341,7 @@ void *data)
** it is long enough!
*/
UINT8 test[sizeof(wlandev->rx) + sizeof(hw->tallies)];
u8 test[sizeof(wlandev->rx) + sizeof(hw->tallies)];
DBFENTER;
......@@ -2443,7 +2443,7 @@ void *data)
hfa384x_WPAData_t wpa;
if (isget) {
hfa384x_drvr_getconfig( hw, HFA384x_RID_CNFWPADATA,
(UINT8 *) &wpa, sizeof(wpa));
(u8 *) &wpa, sizeof(wpa));
pstr->len = hfa384x2host_16(wpa.datalen);
memcpy(pstr->data, wpa.data, pstr->len);
} else {
......@@ -2451,7 +2451,7 @@ void *data)
memcpy(wpa.data, pstr->data, pstr->len);
result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFWPADATA,
(UINT8 *) &wpa, sizeof(wpa));
(u8 *) &wpa, sizeof(wpa));
}
break;
}
......@@ -2482,7 +2482,7 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
{
DBFENTER;
bytestr->len = host2hfa384x_16((UINT16)(pstr->len));
bytestr->len = host2hfa384x_16((u16)(pstr->len));
memcpy(bytestr->data, pstr->data, pstr->len);
DBFEXIT;
}
......@@ -2503,7 +2503,7 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
*
----------------------------------------------------------------*/
void prism2mgmt_pstr2bytearea(UINT8 *bytearea, p80211pstrd_t *pstr)
void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
{
DBFENTER;
......@@ -2531,7 +2531,7 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
{
DBFENTER;
pstr->len = (UINT8)(hfa384x2host_16((UINT16)(bytestr->len)));
pstr->len = (u8)(hfa384x2host_16((u16)(bytestr->len)));
memcpy(pstr->data, bytestr->data, pstr->len);
DBFEXIT;
}
......@@ -2552,11 +2552,11 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
*
----------------------------------------------------------------*/
void prism2mgmt_bytearea2pstr(UINT8 *bytearea, p80211pstrd_t *pstr, int len)
void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len)
{
DBFENTER;
pstr->len = (UINT8)len;
pstr->len = (u8)len;
memcpy(pstr->data, bytearea, len);
DBFEXIT;
}
......@@ -2576,11 +2576,11 @@ void prism2mgmt_bytearea2pstr(UINT8 *bytearea, p80211pstrd_t *pstr, int len)
*
----------------------------------------------------------------*/
void prism2mgmt_prism2int2p80211int(UINT16 *prism2int, UINT32 *wlanint)
void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint)
{
DBFENTER;
*wlanint = (UINT32)hfa384x2host_16(*prism2int);
*wlanint = (u32)hfa384x2host_16(*prism2int);
DBFEXIT;
}
......@@ -2599,11 +2599,11 @@ void prism2mgmt_prism2int2p80211int(UINT16 *prism2int, UINT32 *wlanint)
*
----------------------------------------------------------------*/
void prism2mgmt_p80211int2prism2int(UINT16 *prism2int, UINT32 *wlanint)
void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint)
{
DBFENTER;
*prism2int = host2hfa384x_16((UINT16)(*wlanint));
*prism2int = host2hfa384x_16((u16)(*wlanint));
DBFEXIT;
}
......@@ -2622,7 +2622,7 @@ void prism2mgmt_p80211int2prism2int(UINT16 *prism2int, UINT32 *wlanint)
* Nothing
*
----------------------------------------------------------------*/
void prism2mgmt_prism2enum2p80211enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid)
void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
{
DBFENTER;
......@@ -2648,7 +2648,7 @@ void prism2mgmt_prism2enum2p80211enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT
* Nothing
*
----------------------------------------------------------------*/
void prism2mgmt_p80211enum2prism2enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT16 rid)
void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
{
DBFENTER;
......@@ -2674,10 +2674,10 @@ void prism2mgmt_p80211enum2prism2enum(UINT16 *prism2enum, UINT32 *wlanenum, UINT
* Nothing
*
----------------------------------------------------------------*/
void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
{
UINT8 len;
UINT8 *datarate;
u8 len;
u8 *datarate;
DBFENTER;
......@@ -2686,29 +2686,29 @@ void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
/* 1 Mbps */
if ( BIT0 & (*rate) ) {
len += (UINT8)1;
*datarate = (UINT8)2;
len += (u8)1;
*datarate = (u8)2;
datarate++;
}
/* 2 Mbps */
if ( BIT1 & (*rate) ) {
len += (UINT8)1;
*datarate = (UINT8)4;
len += (u8)1;
*datarate = (u8)4;
datarate++;
}
/* 5.5 Mbps */
if ( BIT2 & (*rate) ) {
len += (UINT8)1;
*datarate = (UINT8)11;
len += (u8)1;
*datarate = (u8)11;
datarate++;
}
/* 11 Mbps */
if ( BIT3 & (*rate) ) {
len += (UINT8)1;
*datarate = (UINT8)22;
len += (u8)1;
*datarate = (u8)22;
datarate++;
}
......@@ -2733,9 +2733,9 @@ void prism2mgmt_get_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
* Nothing
*
----------------------------------------------------------------*/
void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr)
{
UINT8 *datarate;
u8 *datarate;
int i;
DBFENTER;
......@@ -2786,7 +2786,7 @@ void prism2mgmt_set_oprateset(UINT16 *rate, p80211pstrd_t *pstr)
* Nothing
*
----------------------------------------------------------------*/
void prism2mgmt_get_grpaddr(UINT32 did, p80211pstrd_t *pstr,
void prism2mgmt_get_grpaddr(u32 did, p80211pstrd_t *pstr,
hfa384x_t *hw )
{
int index;
......@@ -2822,10 +2822,10 @@ void prism2mgmt_get_grpaddr(UINT32 did, p80211pstrd_t *pstr,
* !0 Error
*
----------------------------------------------------------------*/
int prism2mgmt_set_grpaddr(UINT32 did, UINT8 *prism2buf,
int prism2mgmt_set_grpaddr(u32 did, u8 *prism2buf,
p80211pstrd_t *pstr, hfa384x_t *hw )
{
UINT8 no_addr[WLAN_ADDR_LEN];
u8 no_addr[WLAN_ADDR_LEN];
int index;
DBFENTER;
......@@ -2888,7 +2888,7 @@ int prism2mgmt_set_grpaddr(UINT32 did, UINT8 *prism2buf,
* < 0 If not valid did
*
----------------------------------------------------------------*/
int prism2mgmt_get_grpaddr_index( UINT32 did )
int prism2mgmt_get_grpaddr_index( u32 did )
{
int index;
......
drivers/staging/wlan-ng/prism2sta.c
View file @ aaad4303
......@@ -189,7 +189,7 @@ inline void dmpmem(void *buf, int n)
int c;
for ( c= 0; c < n; c++) {
if ( (c % 16) == 0 ) printk(KERN_DEBUG"dmp[%d]: ", c);
printk("%02x ", ((UINT8*)buf)[c]);
printk("%02x ", ((u8*)buf)[c]);
if ( (c % 16) == 15 ) printk("\n");
}
if ( (c % 16) != 0 ) printk("\n");
......@@ -534,10 +534,10 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
* process thread (usually)
* interrupt
----------------------------------------------------------------*/
UINT32 prism2sta_ifstate(wlandevice_t *wlandev, UINT32 ifstate)
u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
{
hfa384x_t *hw = (hfa384x_t *)wlandev->priv;
UINT32 result;
u32 result;
DBFENTER;
result = P80211ENUM_resultcode_implementation_failure;
......@@ -712,8 +712,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
{
int result = 0;
hfa384x_t *hw = (hfa384x_t *)wlandev->priv;
UINT16 temp;
UINT8 snum[HFA384x_RID_NICSERIALNUMBER_LEN];
u16 temp;
u8 snum[HFA384x_RID_NICSERIALNUMBER_LEN];
char pstr[(HFA384x_RID_NICSERIALNUMBER_LEN * 4) + 1];
DBFENTER;
......@@ -778,7 +778,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
/* strip out the 'special' variant bits */
hw->mm_mods = hw->ident_sta_fw.variant & (BIT14 | BIT15);
hw->ident_sta_fw.variant &= ~((UINT16)(BIT14 | BIT15));
hw->ident_sta_fw.variant &= ~((u16)(BIT14 | BIT15));
if ( hw->ident_sta_fw.id == 0x1f ) {
WLAN_LOG_INFO(
......@@ -1039,7 +1039,7 @@ static int prism2sta_setmulticast(wlandevice_t *wlandev, netdevice_t *dev)
int result = 0;
hfa384x_t *hw = (hfa384x_t *)wlandev->priv;
UINT16 promisc;
u16 promisc;
DBFENTER;
......@@ -1114,9 +1114,9 @@ static void prism2sta_inf_handover(wlandevice_t *wlandev, hfa384x_InfFrame_t *in
static void prism2sta_inf_tallies(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)
{
hfa384x_t *hw = (hfa384x_t *)wlandev->priv;
UINT16 *src16;
UINT32 *dst;
UINT32 *src32;
u16 *src16;
u32 *dst;
u32 *src32;
int i;
int cnt;
......@@ -1127,15 +1127,15 @@ static void prism2sta_inf_tallies(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf
** record length of the info record.
*/
cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(UINT32);
cnt = sizeof(hfa384x_CommTallies32_t) / sizeof(u32);
if (inf->framelen > 22) {
dst = (UINT32 *) &hw->tallies;
src32 = (UINT32 *) &inf->info.commtallies32;
dst = (u32 *) &hw->tallies;
src32 = (u32 *) &inf->info.commtallies32;
for (i = 0; i < cnt; i++, dst++, src32++)
*dst += hfa384x2host_32(*src32);
} else {
dst = (UINT32 *) &hw->tallies;
src16 = (UINT16 *) &inf->info.commtallies16;
dst = (u32 *) &hw->tallies;
src16 = (u16 *) &inf->info.commtallies16;
for (i = 0; i < cnt; i++, dst++, src16++)
*dst += hfa384x2host_16(*src16);
}
......@@ -1175,7 +1175,7 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev,
DBFENTER;
/* Get the number of results, first in bytes, then in results */
nbss = (inf->framelen * sizeof(UINT16)) -
nbss = (inf->framelen * sizeof(u16)) -
sizeof(inf->infotype) -
sizeof(inf->info.scanresult.scanreason);
nbss /= sizeof(hfa384x_ScanResultSub_t);
......@@ -1367,7 +1367,7 @@ void prism2sta_processing_defer(struct work_struct *data)
/* Don't call this in monitor mode */
if ( wlandev->netdev->type == ARPHRD_ETHER ) {
UINT16 portstatus;
u16 portstatus;
WLAN_LOG_INFO("linkstatus=CONNECTED\n");
......@@ -1703,7 +1703,7 @@ static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,
hfa384x_authenticateStation_data_t rec;
int i, added, result, cnt;
UINT8 *addr;
u8 *addr;
DBFENTER;
......@@ -2030,7 +2030,7 @@ void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)
* Call context:
* interrupt
----------------------------------------------------------------*/
void prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status)
void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status)
{
DBFENTER;
......@@ -2057,7 +2057,7 @@ void prism2sta_ev_txexc(wlandevice_t *wlandev, UINT16 status)
* Call context:
* interrupt
----------------------------------------------------------------*/
void prism2sta_ev_tx(wlandevice_t *wlandev, UINT16 status)
void prism2sta_ev_tx(wlandevice_t *wlandev, u16 status)
{
DBFENTER;
WLAN_LOG_DEBUG(4, "Tx Complete, status=0x%04x\n", status);
......
drivers/staging/wlan-ng/wlan_compat.h
View file @ aaad4303
......@@ -93,30 +93,6 @@
#define BIT30 0x40000000
#define BIT31 0x80000000
#include <linux/types.h>
typedef u_int8_t UINT8;
typedef u_int16_t UINT16;
typedef u_int32_t UINT32;
typedef int8_t INT8;
typedef int16_t INT16;
typedef int32_t INT32;
typedef unsigned int UINT;
typedef signed int INT;
typedef u_int64_t UINT64;
typedef int64_t INT64;
#define UINT8_MAX (0xffUL)
#define UINT16_MAX (0xffffUL)
#define UINT32_MAX (0xffffffffUL)
#define INT8_MAX (0x7fL)
#define INT16_MAX (0x7fffL)
#define INT32_MAX (0x7fffffffL)
/*=============================================================*/
/*------ Compiler Portability Macros --------------------------*/
/*=============================================================*/
......@@ -126,14 +102,14 @@ typedef int64_t INT64;
/*------ OS Portability Macros --------------------------------*/
/*=============================================================*/
#ifndef WLAN_DBVAR
#define WLAN_DBVAR wlan_debug
#endif
#ifndef KERNEL_VERSION
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
#endif
#ifndef WLAN_DBVAR
#define WLAN_DBVAR wlan_debug
#endif
#define WLAN_RELEASE "0.3.0-lkml"
#include <linux/hardirq.h>
......@@ -153,7 +129,7 @@ typedef int64_t INT64;
int __i__; \
printk(KERN_DEBUG x ":"); \
for( __i__=0; __i__ < (n); __i__++) \
printk( " %02x", ((UINT8*)(p))[__i__]); \
printk( " %02x", ((u8*)(p))[__i__]); \
printk("\n"); }
#define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } }
#define DBFEXIT { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"<----\n"); } }
......@@ -198,7 +174,7 @@ do { \
\
add_wait_queue(&wq, &__wait); \
for (;;) { \
set_current_state(TASK_INTERRUPTIBLE); \
set_current_state(TASK_intERRUPTIBLE); \
if (condition) \
break; \
if (!signal_pending(current)) { \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7