diff options
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 10 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x_usb.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 111367606f56..24e8ac41de46 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -865,15 +865,15 @@ struct hfa384x_usb_infofrm { struct hfa384x_InfFrame info; } __packed; -typedef struct hfa384x_usb_statusresp { +struct hfa384x_usb_statusresp { u16 type; u16 status; u16 resp0; u16 resp1; u16 resp2; -} __packed hfa384x_usb_cmdresp_t; +} __packed; -typedef hfa384x_usb_cmdresp_t hfa384x_usb_wridresp_t; +typedef struct hfa384x_usb_statusresp hfa384x_usb_wridresp_t; typedef struct hfa384x_usb_rridresp { u16 type; @@ -882,7 +882,7 @@ typedef struct hfa384x_usb_rridresp { u8 data[HFA384x_RIDDATA_MAXLEN]; } __packed hfa384x_usb_rridresp_t; -typedef hfa384x_usb_cmdresp_t hfa384x_usb_wmemresp_t; +typedef struct hfa384x_usb_statusresp hfa384x_usb_wmemresp_t; typedef struct hfa384x_usb_rmemresp { u16 type; @@ -918,7 +918,7 @@ typedef union hfa384x_usbin { struct hfa384x_usb_rxfrm rxfrm; struct hfa384x_usb_txfrm txfrm; struct hfa384x_usb_infofrm infofrm; - hfa384x_usb_cmdresp_t cmdresp; + struct hfa384x_usb_statusresp cmdresp; hfa384x_usb_wridresp_t wridresp; hfa384x_usb_rridresp_t rridresp; hfa384x_usb_wmemresp_t wmemresp; diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 76d1223f812f..7d09f250c0be 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -212,7 +212,7 @@ unlocked_usbctlx_cancel_async(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx); static void hfa384x_cb_status(hfa384x_t *hw, const hfa384x_usbctlx_t *ctlx); static int -usbctlx_get_status(const hfa384x_usb_cmdresp_t *cmdresp, +usbctlx_get_status(const struct hfa384x_usb_statusresp *cmdresp, hfa384x_cmdresult_t *result); static void @@ -621,7 +621,7 @@ static hfa384x_usbctlx_t *usbctlx_alloc(void) } static int -usbctlx_get_status(const hfa384x_usb_cmdresp_t *cmdresp, +usbctlx_get_status(const struct hfa384x_usb_statusresp *cmdresp, hfa384x_cmdresult_t *result) { result->status = le16_to_cpu(cmdresp->status); @@ -652,7 +652,7 @@ usbctlx_get_rridresult(const hfa384x_usb_rridresp_t *rridresp, struct usbctlx_cmd_completor { struct usbctlx_completor head; - const hfa384x_usb_cmdresp_t *cmdresp; + const struct hfa384x_usb_statusresp *cmdresp; hfa384x_cmdresult_t *result; }; @@ -667,7 +667,7 @@ static inline int usbctlx_cmd_completor_fn(struct usbctlx_completor *head) static inline struct usbctlx_completor *init_cmd_completor( struct usbctlx_cmd_completor *completor, - const hfa384x_usb_cmdresp_t + const struct hfa384x_usb_statusresp *cmdresp, hfa384x_cmdresult_t *result) { |