hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: wlang-ng: avoid new typedef: hfa384x_t 

This patch fixes the following checkpatch.pl warning in hfa384x.h:
WARNING: do not add new typedefs

It applies for typedef hfa384x_t

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos 2016-09-28 20:20:19 +02:00 committed by Greg Kroah-Hartman
parent e2f503c40d
commit 5a2214e2e0
7 changed files with 169 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/staging/wlan-ng/hfa384x.h
View File

@ -1241,7 +1241,7 @@ struct prism2sta_accesslist {
u8 addr1[WLAN_ACCESS_MAX][ETH_ALEN]; u8 addr1[WLAN_ACCESS_MAX][ETH_ALEN];
}; };
typedef struct hfa384x { struct hfa384x {
/* USB support data */ /* USB support data */
struct usb_device *usb; struct usb_device *usb;
struct urb rx_urb; struct urb rx_urb;
@ -1377,26 +1377,26 @@ typedef struct hfa384x {
struct prism2sta_accesslist allow; /* Allowed station list. */ struct prism2sta_accesslist allow; /* Allowed station list. */
struct prism2sta_accesslist deny; /* Denied station list. */ struct prism2sta_accesslist deny; /* Denied station list. */
} hfa384x_t; };
void hfa384x_create(hfa384x_t *hw, struct usb_device *usb); void hfa384x_create(struct hfa384x *hw, struct usb_device *usb);
void hfa384x_destroy(hfa384x_t *hw); void hfa384x_destroy(struct hfa384x *hw);
int int
hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis); hfa384x_corereset(struct hfa384x *hw, int holdtime, int settletime, int genesis);
int hfa384x_drvr_disable(hfa384x_t *hw, u16 macport); int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport);
int hfa384x_drvr_enable(hfa384x_t *hw, u16 macport); int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport);
int hfa384x_drvr_flashdl_enable(hfa384x_t *hw); int hfa384x_drvr_flashdl_enable(struct hfa384x *hw);
int hfa384x_drvr_flashdl_disable(hfa384x_t *hw); int hfa384x_drvr_flashdl_disable(struct hfa384x *hw);
int hfa384x_drvr_flashdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len); int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len);
int hfa384x_drvr_getconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len); int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len);
int hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr); int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr);
int hfa384x_drvr_ramdl_disable(hfa384x_t *hw); int hfa384x_drvr_ramdl_disable(struct hfa384x *hw);
int hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len); int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len);
int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, unsigned int len); int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len);
int hfa384x_drvr_setconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len); int hfa384x_drvr_setconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len);
static inline int hfa384x_drvr_getconfig16(hfa384x_t *hw, u16 rid, void *val) static inline int hfa384x_drvr_getconfig16(struct hfa384x *hw, u16 rid, void *val)
{ {
int result = 0; int result = 0;
@ -1406,7 +1406,7 @@ static inline int hfa384x_drvr_getconfig16(hfa384x_t *hw, u16 rid, void *val)
return result; return result;
} }
static inline int hfa384x_drvr_setconfig16(hfa384x_t *hw, u16 rid, u16 val) static inline int hfa384x_drvr_setconfig16(struct hfa384x *hw, u16 rid, u16 val)
{ {
u16 value = cpu_to_le16(val); u16 value = cpu_to_le16(val);
@ -1414,13 +1414,13 @@ static inline int hfa384x_drvr_setconfig16(hfa384x_t *hw, u16 rid, u16 val)
} }
int int
hfa384x_drvr_setconfig_async(hfa384x_t *hw, hfa384x_drvr_setconfig_async(struct hfa384x *hw,
u16 rid, u16 rid,
void *buf, void *buf,
u16 len, ctlx_usercb_t usercb, void *usercb_data); u16 len, ctlx_usercb_t usercb, void *usercb_data);
static inline int static inline int
hfa384x_drvr_setconfig16_async(hfa384x_t *hw, u16 rid, u16 val) hfa384x_drvr_setconfig16_async(struct hfa384x *hw, u16 rid, u16 val)
{ {
u16 value = cpu_to_le16(val); u16 value = cpu_to_le16(val);
@ -1428,21 +1428,21 @@ hfa384x_drvr_setconfig16_async(hfa384x_t *hw, u16 rid, u16 val)
NULL, NULL); NULL, NULL);
} }
int hfa384x_drvr_start(hfa384x_t *hw); int hfa384x_drvr_start(struct hfa384x *hw);
int hfa384x_drvr_stop(hfa384x_t *hw); int hfa384x_drvr_stop(struct hfa384x *hw);
int int
hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb,
union p80211_hdr *p80211_hdr, union p80211_hdr *p80211_hdr,
struct p80211_metawep *p80211_wep); struct p80211_metawep *p80211_wep);
void hfa384x_tx_timeout(struct wlandevice *wlandev); void hfa384x_tx_timeout(struct wlandevice *wlandev);
int hfa384x_cmd_initialize(hfa384x_t *hw); int hfa384x_cmd_initialize(struct hfa384x *hw);
int hfa384x_cmd_enable(hfa384x_t *hw, u16 macport); int hfa384x_cmd_enable(struct hfa384x *hw, u16 macport);
int hfa384x_cmd_disable(hfa384x_t *hw, u16 macport); int hfa384x_cmd_disable(struct hfa384x *hw, u16 macport);
int hfa384x_cmd_allocate(hfa384x_t *hw, u16 len); int hfa384x_cmd_allocate(struct hfa384x *hw, u16 len);
int hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable); int hfa384x_cmd_monitor(struct hfa384x *hw, u16 enable);
int int
hfa384x_cmd_download(hfa384x_t *hw, hfa384x_cmd_download(struct hfa384x *hw,
u16 mode, u16 lowaddr, u16 highaddr, u16 codelen); u16 mode, u16 lowaddr, u16 highaddr, u16 codelen);
#endif /*__KERNEL__ */ #endif /*__KERNEL__ */

170
drivers/staging/wlan-ng/hfa384x_usb.c
View File

@ -158,9 +158,9 @@ hfa384x_int_rxmonitor(struct wlandevice *wlandev, struct hfa384x_usb_rxfrm *rxfr
static void hfa384x_usb_defer(struct work_struct *data); static void hfa384x_usb_defer(struct work_struct *data);
static int submit_rx_urb(hfa384x_t *hw, gfp_t flags); static int submit_rx_urb(struct hfa384x *hw, gfp_t flags);
static int submit_tx_urb(hfa384x_t *hw, struct urb *tx_urb, gfp_t flags); static int submit_tx_urb(struct hfa384x *hw, struct urb *tx_urb, gfp_t flags);
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Callbacks */ /* Callbacks */
@ -175,13 +175,13 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb);
static void hfa384x_usbin_info(struct wlandevice *wlandev, union hfa384x_usbin *usbin); static void hfa384x_usbin_info(struct wlandevice *wlandev, union hfa384x_usbin *usbin);
static void hfa384x_usbin_ctlx(hfa384x_t *hw, union hfa384x_usbin *usbin, static void hfa384x_usbin_ctlx(struct hfa384x *hw, union hfa384x_usbin *usbin,
int urb_status); int urb_status);
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Functions to support the prism2 usb command queue */ /* Functions to support the prism2 usb command queue */
static void hfa384x_usbctlxq_run(hfa384x_t *hw); static void hfa384x_usbctlxq_run(struct hfa384x *hw);
static void hfa384x_usbctlx_reqtimerfn(unsigned long data); static void hfa384x_usbctlx_reqtimerfn(unsigned long data);
@ -193,23 +193,23 @@ static void hfa384x_usbctlx_completion_task(unsigned long data);
static void hfa384x_usbctlx_reaper_task(unsigned long data); static void hfa384x_usbctlx_reaper_task(unsigned long data);
static int hfa384x_usbctlx_submit(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx); static int hfa384x_usbctlx_submit(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx);
static void unlocked_usbctlx_complete(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx); static void unlocked_usbctlx_complete(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx);
struct usbctlx_completor { struct usbctlx_completor {
int (*complete)(struct usbctlx_completor *); int (*complete)(struct usbctlx_completor *);
}; };
static int static int
hfa384x_usbctlx_complete_sync(hfa384x_t *hw, hfa384x_usbctlx_complete_sync(struct hfa384x *hw,
struct hfa384x_usbctlx *ctlx, struct hfa384x_usbctlx *ctlx,
struct usbctlx_completor *completor); struct usbctlx_completor *completor);
static int static int
unlocked_usbctlx_cancel_async(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx); unlocked_usbctlx_cancel_async(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx);
static void hfa384x_cb_status(hfa384x_t *hw, const struct hfa384x_usbctlx *ctlx); static void hfa384x_cb_status(struct hfa384x *hw, const struct hfa384x_usbctlx *ctlx);
static int static int
usbctlx_get_status(const struct hfa384x_usb_statusresp *cmdresp, usbctlx_get_status(const struct hfa384x_usb_statusresp *cmdresp,
@ -222,13 +222,13 @@ usbctlx_get_rridresult(const struct hfa384x_usb_rridresp *rridresp,
/*---------------------------------------------------*/ /*---------------------------------------------------*/
/* Low level req/resp CTLX formatters and submitters */ /* Low level req/resp CTLX formatters and submitters */
static int static int
hfa384x_docmd(hfa384x_t *hw, hfa384x_docmd(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
struct hfa384x_metacmd *cmd, struct hfa384x_metacmd *cmd,
ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data); ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data);
static int static int
hfa384x_dorrid(hfa384x_t *hw, hfa384x_dorrid(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
u16 rid, u16 rid,
void *riddata, void *riddata,
@ -236,7 +236,7 @@ hfa384x_dorrid(hfa384x_t *hw,
ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data); ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data);
static int static int
hfa384x_dowrid(hfa384x_t *hw, hfa384x_dowrid(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
u16 rid, u16 rid,
void *riddata, void *riddata,
@ -244,7 +244,7 @@ hfa384x_dowrid(hfa384x_t *hw,
ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data); ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data);
static int static int
hfa384x_dormem(hfa384x_t *hw, hfa384x_dormem(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
u16 page, u16 page,
u16 offset, u16 offset,
@ -253,7 +253,7 @@ hfa384x_dormem(hfa384x_t *hw,
ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data); ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data);
static int static int
hfa384x_dowmem(hfa384x_t *hw, hfa384x_dowmem(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
u16 page, u16 page,
u16 offset, u16 offset,
@ -278,7 +278,7 @@ static inline const char *ctlxstr(CTLX_STATE s)
return ctlx_str[s]; return ctlx_str[s];
}; };
static inline struct hfa384x_usbctlx *get_active_ctlx(hfa384x_t *hw) static inline struct hfa384x_usbctlx *get_active_ctlx(struct hfa384x *hw)
{ {
return list_entry(hw->ctlxq.active.next, struct hfa384x_usbctlx, list); return list_entry(hw->ctlxq.active.next, struct hfa384x_usbctlx, list);
} }
@ -322,7 +322,7 @@ void dbprint_urb(struct urb *urb)
* Call context: * Call context:
* Any * Any
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int submit_rx_urb(hfa384x_t *hw, gfp_t memflags) static int submit_rx_urb(struct hfa384x *hw, gfp_t memflags)
{ {
struct sk_buff *skb; struct sk_buff *skb;
int result; int result;
@ -384,7 +384,7 @@ done:
* Call context: * Call context:
* Any * Any
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int submit_tx_urb(hfa384x_t *hw, struct urb *tx_urb, gfp_t memflags) static int submit_tx_urb(struct hfa384x *hw, struct urb *tx_urb, gfp_t memflags)
{ {
struct net_device *netdev = hw->wlandev->netdev; struct net_device *netdev = hw->wlandev->netdev;
int result; int result;
@ -429,7 +429,7 @@ static int submit_tx_urb(hfa384x_t *hw, struct urb *tx_urb, gfp_t memflags)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usb_defer(struct work_struct *data) static void hfa384x_usb_defer(struct work_struct *data)
{ {
hfa384x_t *hw = container_of(data, struct hfa384x, usb_work); struct hfa384x *hw = container_of(data, struct hfa384x, usb_work);
struct net_device *netdev = hw->wlandev->netdev; struct net_device *netdev = hw->wlandev->netdev;
/* Don't bother trying to reset anything if the plug /* Don't bother trying to reset anything if the plug
@ -503,7 +503,7 @@ static void hfa384x_usb_defer(struct work_struct *data)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* hfa384x_create * hfa384x_create
* *
* Sets up the hfa384x_t data structure for use. Note this * Sets up the struct hfa384x data structure for use. Note this
* does _not_ initialize the actual hardware, just the data structures * does _not_ initialize the actual hardware, just the data structures
* we use to keep track of its state. * we use to keep track of its state.
* *
@ -521,9 +521,9 @@ static void hfa384x_usb_defer(struct work_struct *data)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
void hfa384x_create(hfa384x_t *hw, struct usb_device *usb) void hfa384x_create(struct hfa384x *hw, struct usb_device *usb)
{ {
memset(hw, 0, sizeof(hfa384x_t)); memset(hw, 0, sizeof(struct hfa384x));
hw->usb = usb; hw->usb = usb;
/* set up the endpoints */ /* set up the endpoints */
@ -592,7 +592,7 @@ void hfa384x_create(hfa384x_t *hw, struct usb_device *usb)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
void hfa384x_destroy(hfa384x_t *hw) void hfa384x_destroy(struct hfa384x *hw)
{ {
struct sk_buff *skb; struct sk_buff *skb;
@ -795,7 +795,7 @@ static inline struct usbctlx_completor *init_rmem_completor(
* Call context: * Call context:
* interrupt * interrupt
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_cb_status(hfa384x_t *hw, const struct hfa384x_usbctlx *ctlx) static void hfa384x_cb_status(struct hfa384x *hw, const struct hfa384x_usbctlx *ctlx)
{ {
if (ctlx->usercb) { if (ctlx->usercb) {
struct hfa384x_cmdresult cmdresult; struct hfa384x_cmdresult cmdresult;
@ -812,13 +812,13 @@ static void hfa384x_cb_status(hfa384x_t *hw, const struct hfa384x_usbctlx *ctlx)
} }
} }
static inline int hfa384x_docmd_wait(hfa384x_t *hw, struct hfa384x_metacmd *cmd) static inline int hfa384x_docmd_wait(struct hfa384x *hw, struct hfa384x_metacmd *cmd)
{ {
return hfa384x_docmd(hw, DOWAIT, cmd, NULL, NULL, NULL); return hfa384x_docmd(hw, DOWAIT, cmd, NULL, NULL, NULL);
} }
static inline int static inline int
hfa384x_docmd_async(hfa384x_t *hw, hfa384x_docmd_async(struct hfa384x *hw,
struct hfa384x_metacmd *cmd, struct hfa384x_metacmd *cmd,
ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data) ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data)
{ {
@ -826,7 +826,7 @@ hfa384x_docmd_async(hfa384x_t *hw,
} }
static inline int static inline int
hfa384x_dorrid_wait(hfa384x_t *hw, u16 rid, void *riddata, hfa384x_dorrid_wait(struct hfa384x *hw, u16 rid, void *riddata,
unsigned int riddatalen) unsigned int riddatalen)
{ {
return hfa384x_dorrid(hw, DOWAIT, return hfa384x_dorrid(hw, DOWAIT,
@ -834,7 +834,7 @@ hfa384x_dorrid_wait(hfa384x_t *hw, u16 rid, void *riddata,
} }
static inline int static inline int
hfa384x_dorrid_async(hfa384x_t *hw, hfa384x_dorrid_async(struct hfa384x *hw,
u16 rid, void *riddata, unsigned int riddatalen, u16 rid, void *riddata, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, void *usercb_data) ctlx_usercb_t usercb, void *usercb_data)
@ -845,7 +845,7 @@ hfa384x_dorrid_async(hfa384x_t *hw,
} }
static inline int static inline int
hfa384x_dowrid_wait(hfa384x_t *hw, u16 rid, void *riddata, hfa384x_dowrid_wait(struct hfa384x *hw, u16 rid, void *riddata,
unsigned int riddatalen) unsigned int riddatalen)
{ {
return hfa384x_dowrid(hw, DOWAIT, return hfa384x_dowrid(hw, DOWAIT,
@ -853,7 +853,7 @@ hfa384x_dowrid_wait(hfa384x_t *hw, u16 rid, void *riddata,
} }
static inline int static inline int
hfa384x_dowrid_async(hfa384x_t *hw, hfa384x_dowrid_async(struct hfa384x *hw,
u16 rid, void *riddata, unsigned int riddatalen, u16 rid, void *riddata, unsigned int riddatalen,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, void *usercb_data) ctlx_usercb_t usercb, void *usercb_data)
@ -864,7 +864,7 @@ hfa384x_dowrid_async(hfa384x_t *hw,
} }
static inline int static inline int
hfa384x_dormem_wait(hfa384x_t *hw, hfa384x_dormem_wait(struct hfa384x *hw,
u16 page, u16 offset, void *data, unsigned int len) u16 page, u16 offset, void *data, unsigned int len)
{ {
return hfa384x_dormem(hw, DOWAIT, return hfa384x_dormem(hw, DOWAIT,
@ -872,7 +872,7 @@ hfa384x_dormem_wait(hfa384x_t *hw,
} }
static inline int static inline int
hfa384x_dormem_async(hfa384x_t *hw, hfa384x_dormem_async(struct hfa384x *hw,
u16 page, u16 offset, void *data, unsigned int len, u16 page, u16 offset, void *data, unsigned int len,
ctlx_cmdcb_t cmdcb, ctlx_cmdcb_t cmdcb,
ctlx_usercb_t usercb, void *usercb_data) ctlx_usercb_t usercb, void *usercb_data)
@ -883,7 +883,7 @@ hfa384x_dormem_async(hfa384x_t *hw,
} }
static inline int static inline int
hfa384x_dowmem_wait(hfa384x_t *hw, hfa384x_dowmem_wait(struct hfa384x *hw,
u16 page, u16 offset, void *data, unsigned int len) u16 page, u16 offset, void *data, unsigned int len)
{ {
return hfa384x_dowmem(hw, DOWAIT, return hfa384x_dowmem(hw, DOWAIT,
@ -891,7 +891,7 @@ hfa384x_dowmem_wait(hfa384x_t *hw,
} }
static inline int static inline int
hfa384x_dowmem_async(hfa384x_t *hw, hfa384x_dowmem_async(struct hfa384x *hw,
u16 page, u16 page,
u16 offset, u16 offset,
void *data, void *data,
@ -923,7 +923,7 @@ hfa384x_dowmem_async(hfa384x_t *hw,
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_initialize(hfa384x_t *hw) int hfa384x_cmd_initialize(struct hfa384x *hw)
{ {
int result = 0; int result = 0;
int i; int i;
@ -969,7 +969,7 @@ int hfa384x_cmd_initialize(hfa384x_t *hw)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_disable(hfa384x_t *hw, u16 macport) int hfa384x_cmd_disable(struct hfa384x *hw, u16 macport)
{ {
struct hfa384x_metacmd cmd; struct hfa384x_metacmd cmd;
@ -1002,7 +1002,7 @@ int hfa384x_cmd_disable(hfa384x_t *hw, u16 macport)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_enable(hfa384x_t *hw, u16 macport) int hfa384x_cmd_enable(struct hfa384x *hw, u16 macport)
{ {
struct hfa384x_metacmd cmd; struct hfa384x_metacmd cmd;
@ -1044,7 +1044,7 @@ int hfa384x_cmd_enable(hfa384x_t *hw, u16 macport)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable) int hfa384x_cmd_monitor(struct hfa384x *hw, u16 enable)
{ {
struct hfa384x_metacmd cmd; struct hfa384x_metacmd cmd;
@ -1095,7 +1095,7 @@ int hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr, int hfa384x_cmd_download(struct hfa384x *hw, u16 mode, u16 lowaddr,
u16 highaddr, u16 codelen) u16 highaddr, u16 codelen)
{ {
struct hfa384x_metacmd cmd; struct hfa384x_metacmd cmd;
@ -1136,7 +1136,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr,
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis) int hfa384x_corereset(struct hfa384x *hw, int holdtime, int settletime, int genesis)
{ {
int result; int result;
@ -1173,7 +1173,7 @@ int hfa384x_corereset(hfa384x_t *hw, int holdtime, int settletime, int genesis)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int hfa384x_usbctlx_complete_sync(hfa384x_t *hw, static int hfa384x_usbctlx_complete_sync(struct hfa384x *hw,
struct hfa384x_usbctlx *ctlx, struct hfa384x_usbctlx *ctlx,
struct usbctlx_completor *completor) struct usbctlx_completor *completor)
{ {
@ -1289,7 +1289,7 @@ cleanup:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int static int
hfa384x_docmd(hfa384x_t *hw, hfa384x_docmd(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
struct hfa384x_metacmd *cmd, struct hfa384x_metacmd *cmd,
ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data) ctlx_cmdcb_t cmdcb, ctlx_usercb_t usercb, void *usercb_data)
@ -1377,7 +1377,7 @@ done:
* process (DOWAIT or DOASYNC) * process (DOWAIT or DOASYNC)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int static int
hfa384x_dorrid(hfa384x_t *hw, hfa384x_dorrid(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
u16 rid, u16 rid,
void *riddata, void *riddata,
@ -1458,7 +1458,7 @@ done:
* process (DOWAIT or DOASYNC) * process (DOWAIT or DOASYNC)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int static int
hfa384x_dowrid(hfa384x_t *hw, hfa384x_dowrid(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
u16 rid, u16 rid,
void *riddata, void *riddata,
@ -1545,7 +1545,7 @@ done:
* process (DOWAIT or DOASYNC) * process (DOWAIT or DOASYNC)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int static int
hfa384x_dormem(hfa384x_t *hw, hfa384x_dormem(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
u16 page, u16 page,
u16 offset, u16 offset,
@ -1636,7 +1636,7 @@ done:
* process (DOWAIT or DOASYNC) * process (DOWAIT or DOASYNC)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int static int
hfa384x_dowmem(hfa384x_t *hw, hfa384x_dowmem(struct hfa384x *hw,
enum cmd_mode mode, enum cmd_mode mode,
u16 page, u16 page,
u16 offset, u16 offset,
@ -1715,7 +1715,7 @@ done:
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_disable(hfa384x_t *hw, u16 macport) int hfa384x_drvr_disable(struct hfa384x *hw, u16 macport)
{ {
int result = 0; int result = 0;
@ -1753,7 +1753,7 @@ int hfa384x_drvr_disable(hfa384x_t *hw, u16 macport)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_enable(hfa384x_t *hw, u16 macport) int hfa384x_drvr_enable(struct hfa384x *hw, u16 macport)
{ {
int result = 0; int result = 0;
@ -1790,7 +1790,7 @@ int hfa384x_drvr_enable(hfa384x_t *hw, u16 macport)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_flashdl_enable(hfa384x_t *hw) int hfa384x_drvr_flashdl_enable(struct hfa384x *hw)
{ {
int result = 0; int result = 0;
int i; int i;
@ -1849,7 +1849,7 @@ int hfa384x_drvr_flashdl_enable(hfa384x_t *hw)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_flashdl_disable(hfa384x_t *hw) int hfa384x_drvr_flashdl_disable(struct hfa384x *hw)
{ {
/* Check that we're already in the download state */ /* Check that we're already in the download state */
if (hw->dlstate != HFA384x_DLSTATE_FLASHENABLED) if (hw->dlstate != HFA384x_DLSTATE_FLASHENABLED)
@ -1894,7 +1894,7 @@ int hfa384x_drvr_flashdl_disable(hfa384x_t *hw)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_flashdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len) int hfa384x_drvr_flashdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len)
{ {
int result = 0; int result = 0;
u32 dlbufaddr; u32 dlbufaddr;
@ -2032,7 +2032,7 @@ exit_proc:
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_getconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len) int hfa384x_drvr_getconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len)
{ {
return hfa384x_dorrid_wait(hw, rid, buf, len); return hfa384x_dorrid_wait(hw, rid, buf, len);
} }
@ -2061,7 +2061,7 @@ int hfa384x_drvr_getconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len)
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int int
hfa384x_drvr_setconfig_async(hfa384x_t *hw, hfa384x_drvr_setconfig_async(struct hfa384x *hw,
u16 rid, u16 rid,
void *buf, void *buf,
u16 len, ctlx_usercb_t usercb, void *usercb_data) u16 len, ctlx_usercb_t usercb, void *usercb_data)
@ -2088,7 +2088,7 @@ hfa384x_drvr_setconfig_async(hfa384x_t *hw,
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_ramdl_disable(hfa384x_t *hw) int hfa384x_drvr_ramdl_disable(struct hfa384x *hw)
{ {
/* Check that we're already in the download state */ /* Check that we're already in the download state */
if (hw->dlstate != HFA384x_DLSTATE_RAMENABLED) if (hw->dlstate != HFA384x_DLSTATE_RAMENABLED)
@ -2128,7 +2128,7 @@ int hfa384x_drvr_ramdl_disable(hfa384x_t *hw)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr) int hfa384x_drvr_ramdl_enable(struct hfa384x *hw, u32 exeaddr)
{ {
int result = 0; int result = 0;
u16 lowaddr; u16 lowaddr;
@ -2196,7 +2196,7 @@ int hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len) int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len)
{ {
int result = 0; int result = 0;
int nwrites; int nwrites;
@ -2276,7 +2276,7 @@ int hfa384x_drvr_ramdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len)
* Call context: * Call context:
* process or non-card interrupt. * process or non-card interrupt.
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, unsigned int len) int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len)
{ {
int result = 0; int result = 0;
u16 *pda = buf; u16 *pda = buf;
@ -2386,7 +2386,7 @@ int hfa384x_drvr_readpda(hfa384x_t *hw, void *buf, unsigned int len)
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_setconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len) int hfa384x_drvr_setconfig(struct hfa384x *hw, u16 rid, void *buf, u16 len)
{ {
return hfa384x_dowrid_wait(hw, rid, buf, len); return hfa384x_dowrid_wait(hw, rid, buf, len);
} }
@ -2411,7 +2411,7 @@ int hfa384x_drvr_setconfig(hfa384x_t *hw, u16 rid, void *buf, u16 len)
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_start(hfa384x_t *hw) int hfa384x_drvr_start(struct hfa384x *hw)
{ {
int result, result1, result2; int result, result1, result2;
u16 status; u16 status;
@ -2512,7 +2512,7 @@ done:
* Call context: * Call context:
* process * process
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_stop(hfa384x_t *hw) int hfa384x_drvr_stop(struct hfa384x *hw)
{ {
int i; int i;
@ -2562,7 +2562,7 @@ int hfa384x_drvr_stop(hfa384x_t *hw)
* Call context: * Call context:
* interrupt * interrupt
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, int hfa384x_drvr_txframe(struct hfa384x *hw, struct sk_buff *skb,
union p80211_hdr *p80211_hdr, union p80211_hdr *p80211_hdr,
struct p80211_metawep *p80211_wep) struct p80211_metawep *p80211_wep)
{ {
@ -2658,7 +2658,7 @@ exit:
void hfa384x_tx_timeout(struct wlandevice *wlandev) void hfa384x_tx_timeout(struct wlandevice *wlandev)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&hw->ctlxq.lock, flags); spin_lock_irqsave(&hw->ctlxq.lock, flags);
@ -2681,7 +2681,7 @@ void hfa384x_tx_timeout(struct wlandevice *wlandev)
* Tasklet to delete dead CTLX objects * Tasklet to delete dead CTLX objects
* *
* Arguments: * Arguments:
* data ptr to a hfa384x_t * data ptr to a struct hfa384x
* *
* Returns: * Returns:
* *
@ -2690,7 +2690,7 @@ void hfa384x_tx_timeout(struct wlandevice *wlandev)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usbctlx_reaper_task(unsigned long data) static void hfa384x_usbctlx_reaper_task(unsigned long data)
{ {
hfa384x_t *hw = (hfa384x_t *)data; struct hfa384x *hw = (struct hfa384x *)data;
struct hfa384x_usbctlx *ctlx, *temp; struct hfa384x_usbctlx *ctlx, *temp;
unsigned long flags; unsigned long flags;
@ -2713,7 +2713,7 @@ static void hfa384x_usbctlx_reaper_task(unsigned long data)
* Tasklet to call completion handlers for returned CTLXs * Tasklet to call completion handlers for returned CTLXs
* *
* Arguments: * Arguments:
* data ptr to hfa384x_t * data ptr to struct hfa384x
* *
* Returns: * Returns:
* Nothing * Nothing
@ -2723,7 +2723,7 @@ static void hfa384x_usbctlx_reaper_task(unsigned long data)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usbctlx_completion_task(unsigned long data) static void hfa384x_usbctlx_completion_task(unsigned long data)
{ {
hfa384x_t *hw = (hfa384x_t *)data; struct hfa384x *hw = (struct hfa384x *)data;
struct hfa384x_usbctlx *ctlx, *temp; struct hfa384x_usbctlx *ctlx, *temp;
unsigned long flags; unsigned long flags;
@ -2787,7 +2787,7 @@ static void hfa384x_usbctlx_completion_task(unsigned long data)
* next command on the queue is run afterwards. * next command on the queue is run afterwards.
* *
* Arguments: * Arguments:
* hw ptr to the hfa384x_t structure * hw ptr to the struct hfa384x structure
* ctlx ptr to a CTLX structure * ctlx ptr to a CTLX structure
* *
* Returns: * Returns:
@ -2797,7 +2797,7 @@ static void hfa384x_usbctlx_completion_task(unsigned long data)
* Call context: * Call context:
* Either process or interrupt, but presumably interrupt * Either process or interrupt, but presumably interrupt
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int unlocked_usbctlx_cancel_async(hfa384x_t *hw, static int unlocked_usbctlx_cancel_async(struct hfa384x *hw,
struct hfa384x_usbctlx *ctlx) struct hfa384x_usbctlx *ctlx)
{ {
int ret; int ret;
@ -2836,7 +2836,7 @@ static int unlocked_usbctlx_cancel_async(hfa384x_t *hw,
* tasklet is scheduled. * tasklet is scheduled.
* *
* Arguments: * Arguments:
* hw ptr to a hfa384x_t structure * hw ptr to a struct hfa384x structure
* ctlx ptr to a ctlx structure * ctlx ptr to a ctlx structure
* *
* Returns: * Returns:
@ -2847,7 +2847,7 @@ static int unlocked_usbctlx_cancel_async(hfa384x_t *hw,
* Call context: * Call context:
* Either, assume interrupt * Either, assume interrupt
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void unlocked_usbctlx_complete(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx) static void unlocked_usbctlx_complete(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx)
{ {
/* Timers have been stopped, and ctlx should be in /* Timers have been stopped, and ctlx should be in
* a terminal state. Retire it from the "active" * a terminal state. Retire it from the "active"
@ -2876,7 +2876,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, struct hfa384x_usbctlx *ctl
* Checks to see if the head item is running. If not, starts it. * Checks to see if the head item is running. If not, starts it.
* *
* Arguments: * Arguments:
* hw ptr to hfa384x_t * hw ptr to struct hfa384x
* *
* Returns: * Returns:
* nothing * nothing
@ -2886,7 +2886,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, struct hfa384x_usbctlx *ctl
* Call context: * Call context:
* any * any
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usbctlxq_run(hfa384x_t *hw) static void hfa384x_usbctlxq_run(struct hfa384x *hw)
{ {
unsigned long flags; unsigned long flags;
@ -2989,7 +2989,7 @@ unlock:
static void hfa384x_usbin_callback(struct urb *urb) static void hfa384x_usbin_callback(struct urb *urb)
{ {
struct wlandevice *wlandev = urb->context; struct wlandevice *wlandev = urb->context;
hfa384x_t *hw; struct hfa384x *hw;
union hfa384x_usbin *usbin = (union hfa384x_usbin *)urb->transfer_buffer; union hfa384x_usbin *usbin = (union hfa384x_usbin *)urb->transfer_buffer;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
int result; int result;
@ -3154,7 +3154,7 @@ exit:
* queue and our state updated accordingly. * queue and our state updated accordingly.
* *
* Arguments: * Arguments:
* hw ptr to hfa384x_t * hw ptr to struct hfa384x
* usbin ptr to USB IN packet * usbin ptr to USB IN packet
* urb_status status of this Bulk-In URB * urb_status status of this Bulk-In URB
* *
@ -3166,7 +3166,7 @@ exit:
* Call context: * Call context:
* interrupt * interrupt
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usbin_ctlx(hfa384x_t *hw, union hfa384x_usbin *usbin, static void hfa384x_usbin_ctlx(struct hfa384x *hw, union hfa384x_usbin *usbin,
int urb_status) int urb_status)
{ {
struct hfa384x_usbctlx *ctlx; struct hfa384x_usbctlx *ctlx;
@ -3319,7 +3319,7 @@ static void hfa384x_usbin_txcompl(struct wlandevice *wlandev,
static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb) static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)
{ {
union hfa384x_usbin *usbin = (union hfa384x_usbin *)skb->data; union hfa384x_usbin *usbin = (union hfa384x_usbin *)skb->data;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
int hdrlen; int hdrlen;
struct p80211_rxmeta *rxmeta; struct p80211_rxmeta *rxmeta;
u16 data_len; u16 data_len;
@ -3426,7 +3426,7 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,
u8 *datap; u8 *datap;
u16 fc; u16 fc;
struct sk_buff *skb; struct sk_buff *skb;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
/* Remember the status, time, and data_len fields are in host order */ /* Remember the status, time, and data_len fields are in host order */
/* Figure out how big the frame is */ /* Figure out how big the frame is */
@ -3557,7 +3557,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
case -EPIPE: case -EPIPE:
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
netdev_warn(hw->wlandev->netdev, netdev_warn(hw->wlandev->netdev,
"%s tx pipe stalled: requesting reset\n", "%s tx pipe stalled: requesting reset\n",
@ -3573,7 +3573,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
case -ETIMEDOUT: case -ETIMEDOUT:
case -EILSEQ: case -EILSEQ:
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
if (!test_and_set_bit if (!test_and_set_bit
(THROTTLE_TX, &hw->usb_flags) && (THROTTLE_TX, &hw->usb_flags) &&
@ -3618,7 +3618,7 @@ static void hfa384x_usbout_callback(struct urb *urb)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_ctlxout_callback(struct urb *urb) static void hfa384x_ctlxout_callback(struct urb *urb)
{ {
hfa384x_t *hw = urb->context; struct hfa384x *hw = urb->context;
int delete_resptimer = 0; int delete_resptimer = 0;
int timer_ok = 1; int timer_ok = 1;
int run_queue = 0; int run_queue = 0;
@ -3737,7 +3737,7 @@ delresp:
* URB containing a Prism2.x XXX_Request was never called. * URB containing a Prism2.x XXX_Request was never called.
* *
* Arguments: * Arguments:
* data a ptr to the hfa384x_t * data a ptr to the struct hfa384x
* *
* Returns: * Returns:
* nothing * nothing
@ -3749,7 +3749,7 @@ delresp:
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usbctlx_reqtimerfn(unsigned long data) static void hfa384x_usbctlx_reqtimerfn(unsigned long data)
{ {
hfa384x_t *hw = (hfa384x_t *)data; struct hfa384x *hw = (struct hfa384x *)data;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&hw->ctlxq.lock, flags); spin_lock_irqsave(&hw->ctlxq.lock, flags);
@ -3795,7 +3795,7 @@ static void hfa384x_usbctlx_reqtimerfn(unsigned long data)
* URB containing a Prism2.x XXX_Response was never called. * URB containing a Prism2.x XXX_Response was never called.
* *
* Arguments: * Arguments:
* data a ptr to the hfa384x_t * data a ptr to the struct hfa384x
* *
* Returns: * Returns:
* nothing * nothing
@ -3807,7 +3807,7 @@ static void hfa384x_usbctlx_reqtimerfn(unsigned long data)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usbctlx_resptimerfn(unsigned long data) static void hfa384x_usbctlx_resptimerfn(unsigned long data)
{ {
hfa384x_t *hw = (hfa384x_t *)data; struct hfa384x *hw = (struct hfa384x *)data;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&hw->ctlxq.lock, flags); spin_lock_irqsave(&hw->ctlxq.lock, flags);
@ -3846,7 +3846,7 @@ static void hfa384x_usbctlx_resptimerfn(unsigned long data)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void hfa384x_usb_throttlefn(unsigned long data) static void hfa384x_usb_throttlefn(unsigned long data)
{ {
hfa384x_t *hw = (hfa384x_t *)data; struct hfa384x *hw = (struct hfa384x *)data;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&hw->ctlxq.lock, flags); spin_lock_irqsave(&hw->ctlxq.lock, flags);
@ -3886,7 +3886,7 @@ static void hfa384x_usb_throttlefn(unsigned long data)
* Call context: * Call context:
* process or interrupt * process or interrupt
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int hfa384x_usbctlx_submit(hfa384x_t *hw, struct hfa384x_usbctlx *ctlx) static int hfa384x_usbctlx_submit(struct hfa384x *hw, struct hfa384x_usbctlx *ctlx)
{ {
unsigned long flags; unsigned long flags;

20
drivers/staging/wlan-ng/prism2mgmt.c
View File

@ -116,7 +116,7 @@
int prism2mgmt_scan(struct wlandevice *wlandev, void *msgp) int prism2mgmt_scan(struct wlandevice *wlandev, void *msgp)
{ {
int result = 0; int result = 0;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct p80211msg_dot11req_scan *msg = msgp; struct p80211msg_dot11req_scan *msg = msgp;
u16 roamingmode, word; u16 roamingmode, word;
int i, timeout; int i, timeout;
@ -370,7 +370,7 @@ int prism2mgmt_scan_results(struct wlandevice *wlandev, void *msgp)
{ {
int result = 0; int result = 0;
struct p80211msg_dot11req_scan_results *req; struct p80211msg_dot11req_scan_results *req;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct hfa384x_HScanResultSub *item = NULL; struct hfa384x_HScanResultSub *item = NULL;
int count; int count;
@ -528,7 +528,7 @@ exit:
int prism2mgmt_start(struct wlandevice *wlandev, void *msgp) int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)
{ {
int result = 0; int result = 0;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct p80211msg_dot11req_start *msg = msgp; struct p80211msg_dot11req_start *msg = msgp;
struct p80211pstrd *pstr; struct p80211pstrd *pstr;
@ -708,7 +708,7 @@ done:
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int prism2mgmt_readpda(struct wlandevice *wlandev, void *msgp) int prism2mgmt_readpda(struct wlandevice *wlandev, void *msgp)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct p80211msg_p2req_readpda *msg = msgp; struct p80211msg_p2req_readpda *msg = msgp;
int result; int result;
@ -774,7 +774,7 @@ int prism2mgmt_readpda(struct wlandevice *wlandev, void *msgp)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int prism2mgmt_ramdl_state(struct wlandevice *wlandev, void *msgp) int prism2mgmt_ramdl_state(struct wlandevice *wlandev, void *msgp)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct p80211msg_p2req_ramdl_state *msg = msgp; struct p80211msg_p2req_ramdl_state *msg = msgp;
if (wlandev->msdstate != WLAN_MSD_FWLOAD) { if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
@ -829,7 +829,7 @@ int prism2mgmt_ramdl_state(struct wlandevice *wlandev, void *msgp)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int prism2mgmt_ramdl_write(struct wlandevice *wlandev, void *msgp) int prism2mgmt_ramdl_write(struct wlandevice *wlandev, void *msgp)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct p80211msg_p2req_ramdl_write *msg = msgp; struct p80211msg_p2req_ramdl_write *msg = msgp;
u32 addr; u32 addr;
u32 len; u32 len;
@ -891,7 +891,7 @@ int prism2mgmt_ramdl_write(struct wlandevice *wlandev, void *msgp)
int prism2mgmt_flashdl_state(struct wlandevice *wlandev, void *msgp) int prism2mgmt_flashdl_state(struct wlandevice *wlandev, void *msgp)
{ {
int result = 0; int result = 0;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct p80211msg_p2req_flashdl_state *msg = msgp; struct p80211msg_p2req_flashdl_state *msg = msgp;
if (wlandev->msdstate != WLAN_MSD_FWLOAD) { if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
@ -961,7 +961,7 @@ int prism2mgmt_flashdl_state(struct wlandevice *wlandev, void *msgp)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int prism2mgmt_flashdl_write(struct wlandevice *wlandev, void *msgp) int prism2mgmt_flashdl_write(struct wlandevice *wlandev, void *msgp)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct p80211msg_p2req_flashdl_write *msg = msgp; struct p80211msg_p2req_flashdl_write *msg = msgp;
u32 addr; u32 addr;
u32 len; u32 len;
@ -1021,7 +1021,7 @@ int prism2mgmt_flashdl_write(struct wlandevice *wlandev, void *msgp)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp) int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
int result = 0; int result = 0;
u16 reg; u16 reg;
u16 port_type; u16 port_type;
@ -1095,7 +1095,7 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp)
int result = 0; int result = 0;
struct p80211msg_lnxreq_wlansniff *msg = msgp; struct p80211msg_lnxreq_wlansniff *msg = msgp;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
u16 word; u16 word;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;

5
drivers/staging/wlan-ng/prism2mgmt.h
View File

@ -96,10 +96,11 @@ void prism2mgmt_bytestr2pstr(struct hfa384x_bytestr *bytestr,
struct p80211pstrd *pstr); struct p80211pstrd *pstr);
/* functions to convert Group Addresses */ /* functions to convert Group Addresses */
void prism2mgmt_get_grpaddr(u32 did, struct p80211pstrd *pstr, hfa384x_t *priv); void prism2mgmt_get_grpaddr(u32 did, struct p80211pstrd *pstr,
struct hfa384x *priv);
int prism2mgmt_set_grpaddr(u32 did, int prism2mgmt_set_grpaddr(u32 did,
u8 *prism2buf, struct p80211pstrd *pstr, u8 *prism2buf, struct p80211pstrd *pstr,
hfa384x_t *priv); struct hfa384x *priv);
int prism2mgmt_get_grpaddr_index(u32 did); int prism2mgmt_get_grpaddr_index(u32 did);
void prism2sta_processing_defer(struct work_struct *data); void prism2sta_processing_defer(struct work_struct *data);

36
drivers/staging/wlan-ng/prism2mib.c
View File

@ -88,61 +88,61 @@ struct mibrec {
int (*func)(struct mibrec *mib, int (*func)(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, void *data); struct p80211msg_dot11req_mibset *msg, void *data);
}; };
static int prism2mib_bytearea2pstr(struct mibrec *mib, static int prism2mib_bytearea2pstr(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data); void *data);
static int prism2mib_uint32(struct mibrec *mib, static int prism2mib_uint32(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, void *data); struct p80211msg_dot11req_mibset *msg, void *data);
static int prism2mib_flag(struct mibrec *mib, static int prism2mib_flag(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, void *data); struct p80211msg_dot11req_mibset *msg, void *data);
static int prism2mib_wepdefaultkey(struct mibrec *mib, static int prism2mib_wepdefaultkey(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data); void *data);
static int prism2mib_privacyinvoked(struct mibrec *mib, static int prism2mib_privacyinvoked(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data); void *data);
static int prism2mib_excludeunencrypted(struct mibrec *mib, static int prism2mib_excludeunencrypted(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data); void *data);
static int prism2mib_fragmentationthreshold(struct mibrec *mib, static int prism2mib_fragmentationthreshold(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data); void *data);
static int prism2mib_priv(struct mibrec *mib, static int prism2mib_priv(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, void *data); struct p80211msg_dot11req_mibset *msg, void *data);
static struct mibrec mibtab[] = { static struct mibrec mibtab[] = {
@ -259,7 +259,7 @@ static struct mibrec mibtab[] = {
int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp) int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
int result, isget; int result, isget;
struct mibrec *mib; struct mibrec *mib;
@ -374,7 +374,7 @@ done:
static int prism2mib_bytearea2pstr(struct mibrec *mib, static int prism2mib_bytearea2pstr(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data) void *data)
{ {
@ -424,7 +424,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib,
static int prism2mib_uint32(struct mibrec *mib, static int prism2mib_uint32(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, void *data) struct p80211msg_dot11req_mibset *msg, void *data)
{ {
int result; int result;
@ -471,7 +471,7 @@ static int prism2mib_uint32(struct mibrec *mib,
static int prism2mib_flag(struct mibrec *mib, static int prism2mib_flag(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, void *data) struct p80211msg_dot11req_mibset *msg, void *data)
{ {
int result; int result;
@ -528,7 +528,7 @@ static int prism2mib_flag(struct mibrec *mib,
static int prism2mib_wepdefaultkey(struct mibrec *mib, static int prism2mib_wepdefaultkey(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data) void *data)
{ {
@ -578,7 +578,7 @@ static int prism2mib_wepdefaultkey(struct mibrec *mib,
static int prism2mib_privacyinvoked(struct mibrec *mib, static int prism2mib_privacyinvoked(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data) void *data)
{ {
@ -620,7 +620,7 @@ static int prism2mib_privacyinvoked(struct mibrec *mib,
static int prism2mib_excludeunencrypted(struct mibrec *mib, static int prism2mib_excludeunencrypted(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data) void *data)
{ {
@ -656,7 +656,7 @@ static int prism2mib_excludeunencrypted(struct mibrec *mib,
static int prism2mib_fragmentationthreshold(struct mibrec *mib, static int prism2mib_fragmentationthreshold(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, struct p80211msg_dot11req_mibset *msg,
void *data) void *data)
{ {
@ -702,7 +702,7 @@ static int prism2mib_fragmentationthreshold(struct mibrec *mib,
static int prism2mib_priv(struct mibrec *mib, static int prism2mib_priv(struct mibrec *mib,
int isget, int isget,
struct wlandevice *wlandev, struct wlandevice *wlandev,
hfa384x_t *hw, struct hfa384x *hw,
struct p80211msg_dot11req_mibset *msg, void *data) struct p80211msg_dot11req_mibset *msg, void *data)
{ {
struct p80211pstrd *pstr = data; struct p80211pstrd *pstr = data;

40
drivers/staging/wlan-ng/prism2sta.c
View File

@ -243,7 +243,7 @@ static int prism2sta_txframe(struct wlandevice *wlandev, struct sk_buff *skb,
union p80211_hdr *p80211_hdr, union p80211_hdr *p80211_hdr,
struct p80211_metawep *p80211_wep) struct p80211_metawep *p80211_wep)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
/* If necessary, set the 802.11 WEP bit */ /* If necessary, set the 802.11 WEP bit */
if ((wlandev->hostwep & (HOSTWEP_PRIVACYINVOKED | HOSTWEP_ENCRYPT)) == if ((wlandev->hostwep & (HOSTWEP_PRIVACYINVOKED | HOSTWEP_ENCRYPT)) ==
@ -280,7 +280,7 @@ static int prism2sta_txframe(struct wlandevice *wlandev, struct sk_buff *skb,
*/ */
static int prism2sta_mlmerequest(struct wlandevice *wlandev, struct p80211msg *msg) static int prism2sta_mlmerequest(struct wlandevice *wlandev, struct p80211msg *msg)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
int result = 0; int result = 0;
@ -410,7 +410,7 @@ static int prism2sta_mlmerequest(struct wlandevice *wlandev, struct p80211msg *m
*/ */
u32 prism2sta_ifstate(struct wlandevice *wlandev, u32 ifstate) u32 prism2sta_ifstate(struct wlandevice *wlandev, u32 ifstate)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
u32 result; u32 result;
result = P80211ENUM_resultcode_implementation_failure; result = P80211ENUM_resultcode_implementation_failure;
@ -584,7 +584,7 @@ u32 prism2sta_ifstate(struct wlandevice *wlandev, u32 ifstate)
static int prism2sta_getcardinfo(struct wlandevice *wlandev) static int prism2sta_getcardinfo(struct wlandevice *wlandev)
{ {
int result = 0; int result = 0;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
u16 temp; u16 temp;
u8 snum[HFA384x_RID_NICSERIALNUMBER_LEN]; u8 snum[HFA384x_RID_NICSERIALNUMBER_LEN];
@ -912,7 +912,7 @@ done:
*/ */
static int prism2sta_globalsetup(struct wlandevice *wlandev) static int prism2sta_globalsetup(struct wlandevice *wlandev)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
/* Set the maximum frame size */ /* Set the maximum frame size */
return hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN, return hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFMAXDATALEN,
@ -923,7 +923,7 @@ static int prism2sta_setmulticast(struct wlandevice *wlandev,
struct net_device *dev) struct net_device *dev)
{ {
int result = 0; int result = 0;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
u16 promisc; u16 promisc;
@ -987,7 +987,7 @@ static void prism2sta_inf_handover(struct wlandevice *wlandev,
static void prism2sta_inf_tallies(struct wlandevice *wlandev, static void prism2sta_inf_tallies(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
u16 *src16; u16 *src16;
u32 *dst; u32 *dst;
u32 *src32; u32 *src32;
@ -1033,7 +1033,7 @@ static void prism2sta_inf_tallies(struct wlandevice *wlandev,
static void prism2sta_inf_scanresults(struct wlandevice *wlandev, static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
int nbss; int nbss;
struct hfa384x_ScanResult *sr = &(inf->info.scanresult); struct hfa384x_ScanResult *sr = &(inf->info.scanresult);
int i; int i;
@ -1088,7 +1088,7 @@ static void prism2sta_inf_scanresults(struct wlandevice *wlandev,
static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev, static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
int nbss; int nbss;
nbss = (inf->framelen - 3) / 32; nbss = (inf->framelen - 3) / 32;
@ -1129,7 +1129,7 @@ static void prism2sta_inf_hostscanresults(struct wlandevice *wlandev,
static void prism2sta_inf_chinforesults(struct wlandevice *wlandev, static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
unsigned int i, n; unsigned int i, n;
hw->channel_info.results.scanchannels = hw->channel_info.results.scanchannels =
@ -1171,7 +1171,7 @@ static void prism2sta_inf_chinforesults(struct wlandevice *wlandev,
void prism2sta_processing_defer(struct work_struct *data) void prism2sta_processing_defer(struct work_struct *data)
{ {
hfa384x_t *hw = container_of(data, struct hfa384x, link_bh); struct hfa384x *hw = container_of(data, struct hfa384x, link_bh);
struct wlandevice *wlandev = hw->wlandev; struct wlandevice *wlandev = hw->wlandev;
struct hfa384x_bytestr32 ssid; struct hfa384x_bytestr32 ssid;
int result; int result;
@ -1442,7 +1442,7 @@ void prism2sta_processing_defer(struct work_struct *data)
static void prism2sta_inf_linkstatus(struct wlandevice *wlandev, static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
hw->link_status_new = le16_to_cpu(inf->info.linkstatus.linkstatus); hw->link_status_new = le16_to_cpu(inf->info.linkstatus.linkstatus);
@ -1470,7 +1470,7 @@ static void prism2sta_inf_linkstatus(struct wlandevice *wlandev,
static void prism2sta_inf_assocstatus(struct wlandevice *wlandev, static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct hfa384x_AssocStatus rec; struct hfa384x_AssocStatus rec;
int i; int i;
@ -1531,7 +1531,7 @@ static void prism2sta_inf_assocstatus(struct wlandevice *wlandev,
static void prism2sta_inf_authreq(struct wlandevice *wlandev, static void prism2sta_inf_authreq(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct sk_buff *skb; struct sk_buff *skb;
skb = dev_alloc_skb(sizeof(*inf)); skb = dev_alloc_skb(sizeof(*inf));
@ -1546,7 +1546,7 @@ static void prism2sta_inf_authreq(struct wlandevice *wlandev,
static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev, static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
struct hfa384x_authenticateStation_data rec; struct hfa384x_authenticateStation_data rec;
int i, added, result, cnt; int i, added, result, cnt;
@ -1720,7 +1720,7 @@ static void prism2sta_inf_authreq_defer(struct wlandevice *wlandev,
static void prism2sta_inf_psusercnt(struct wlandevice *wlandev, static void prism2sta_inf_psusercnt(struct wlandevice *wlandev,
struct hfa384x_InfFrame *inf) struct hfa384x_InfFrame *inf)
{ {
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
hw->psusercount = le16_to_cpu(inf->info.psusercnt.usercnt); hw->psusercount = le16_to_cpu(inf->info.psusercnt.usercnt);
} }
@ -1880,11 +1880,11 @@ void prism2sta_ev_alloc(struct wlandevice *wlandev)
static struct wlandevice *create_wlan(void) static struct wlandevice *create_wlan(void)
{ {
struct wlandevice *wlandev = NULL; struct wlandevice *wlandev = NULL;
hfa384x_t *hw = NULL; struct hfa384x *hw = NULL;
/* Alloc our structures */ /* Alloc our structures */
wlandev = kzalloc(sizeof(struct wlandevice), GFP_KERNEL); wlandev = kzalloc(sizeof(struct wlandevice), GFP_KERNEL);
hw = kzalloc(sizeof(hfa384x_t), GFP_KERNEL); hw = kzalloc(sizeof(struct hfa384x), GFP_KERNEL);
if (!wlandev || !hw) { if (!wlandev || !hw) {
kfree(wlandev); kfree(wlandev);
@ -1914,7 +1914,7 @@ static struct wlandevice *create_wlan(void)
void prism2sta_commsqual_defer(struct work_struct *data) void prism2sta_commsqual_defer(struct work_struct *data)
{ {
hfa384x_t *hw = container_of(data, struct hfa384x, commsqual_bh); struct hfa384x *hw = container_of(data, struct hfa384x, commsqual_bh);
struct wlandevice *wlandev = hw->wlandev; struct wlandevice *wlandev = hw->wlandev;
struct hfa384x_bytestr32 ssid; struct hfa384x_bytestr32 ssid;
struct p80211msg_dot11req_mibget msg; struct p80211msg_dot11req_mibget msg;
@ -2003,7 +2003,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
void prism2sta_commsqual_timer(unsigned long data) void prism2sta_commsqual_timer(unsigned long data)
{ {
hfa384x_t *hw = (hfa384x_t *)data; struct hfa384x *hw = (struct hfa384x *)data;
schedule_work(&hw->commsqual_bh); schedule_work(&hw->commsqual_bh);
} }

8
drivers/staging/wlan-ng/prism2usb.c
View File

@ -62,7 +62,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
struct usb_device *dev; struct usb_device *dev;
struct wlandevice *wlandev = NULL; struct wlandevice *wlandev = NULL;
hfa384x_t *hw = NULL; struct hfa384x *hw = NULL;
int result = 0; int result = 0;
dev = interface_to_usbdev(interface); dev = interface_to_usbdev(interface);
@ -142,7 +142,7 @@ static void prism2sta_disconnect_usb(struct usb_interface *interface)
struct hfa384x_usbctlx *ctlx, *temp; struct hfa384x_usbctlx *ctlx, *temp;
unsigned long flags; unsigned long flags;
hfa384x_t *hw = wlandev->priv; struct hfa384x *hw = wlandev->priv;
if (!hw) if (!hw)
goto exit; goto exit;
@ -218,7 +218,7 @@ exit:
static int prism2sta_suspend(struct usb_interface *interface, static int prism2sta_suspend(struct usb_interface *interface,
pm_message_t message) pm_message_t message)
{ {
hfa384x_t *hw = NULL; struct hfa384x *hw = NULL;
struct wlandevice *wlandev; struct wlandevice *wlandev;
wlandev = (struct wlandevice *)usb_get_intfdata(interface); wlandev = (struct wlandevice *)usb_get_intfdata(interface);
@ -241,7 +241,7 @@ static int prism2sta_suspend(struct usb_interface *interface,
static int prism2sta_resume(struct usb_interface *interface) static int prism2sta_resume(struct usb_interface *interface)
{ {
int result = 0; int result = 0;
hfa384x_t *hw = NULL; struct hfa384x *hw = NULL;
struct wlandevice *wlandev; struct wlandevice *wlandev;
wlandev = (struct wlandevice *)usb_get_intfdata(interface); wlandev = (struct wlandevice *)usb_get_intfdata(interface);