diff options
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 12 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/prism2fw.c | 6 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 5df4e1f0333d..d462c78b2c9c 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -367,12 +367,12 @@ Configuration Record Structures: --------------------------------------------------------------------*/ /*-- Hardware/Firmware Component Information ----------*/ -typedef struct hfa384x_compident { +struct hfa384x_compident { u16 id; u16 variant; u16 major; u16 minor; -} __packed hfa384x_compident_t; +} __packed; typedef struct hfa384x_caplevel { u16 role; @@ -1304,10 +1304,10 @@ typedef struct hfa384x { unsigned int dot11_grpcnt; /* Component Identities */ - hfa384x_compident_t ident_nic; - hfa384x_compident_t ident_pri_fw; - hfa384x_compident_t ident_sta_fw; - hfa384x_compident_t ident_ap_fw; + struct hfa384x_compident ident_nic; + struct hfa384x_compident ident_pri_fw; + struct hfa384x_compident ident_sta_fw; + struct hfa384x_compident ident_ap_fw; u16 mm_mods; /* Supplier compatibility ranges */ diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 7c5d3e713681..35b0ff996df7 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -96,10 +96,10 @@ struct s3inforec { u16 len; u16 type; union { - hfa384x_compident_t version; + struct hfa384x_compident version; hfa384x_caplevel_t compat; u16 buildseq; - hfa384x_compident_t platform; + struct hfa384x_compident platform; } info; }; @@ -152,7 +152,7 @@ static struct imgchunk fchunk[CHUNKS_MAX]; /* PDA, built from [card|newfile]+[addfile1+addfile2...] */ static struct pda pda; -static hfa384x_compident_t nicid; +static struct hfa384x_compident nicid; static hfa384x_caplevel_t rfid; static hfa384x_caplevel_t macid; static hfa384x_caplevel_t priid; diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 098cb579bd8e..0dbdba88e18a 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -593,7 +593,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev) /* NIC identity */ result = hfa384x_drvr_getconfig(hw, HFA384x_RID_NICIDENTITY, &hw->ident_nic, - sizeof(hfa384x_compident_t)); + sizeof(struct hfa384x_compident)); if (result) { netdev_err(wlandev->netdev, "Failed to retrieve NICIDENTITY\n"); goto failed; @@ -612,7 +612,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev) /* Primary f/w identity */ result = hfa384x_drvr_getconfig(hw, HFA384x_RID_PRIIDENTITY, &hw->ident_pri_fw, - sizeof(hfa384x_compident_t)); + sizeof(struct hfa384x_compident)); if (result) { netdev_err(wlandev->netdev, "Failed to retrieve PRIIDENTITY\n"); goto failed; @@ -631,7 +631,7 @@ static int prism2sta_getcardinfo(struct wlandevice *wlandev) /* Station (Secondary?) f/w identity */ result = hfa384x_drvr_getconfig(hw, HFA384x_RID_STAIDENTITY, &hw->ident_sta_fw, - sizeof(hfa384x_compident_t)); + sizeof(struct hfa384x_compident)); if (result) { netdev_err(wlandev->netdev, "Failed to retrieve STAIDENTITY\n"); goto failed; |