3 files changed, 8 insertions, 8 deletions

diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 9f05c1724fbe..182b2d564627 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -86,8 +86,8 @@ static int prism2_domibset_pstr32(struct wlandevice *wlandev,
                                   u32 did, u8 len, const u8 *data)
 {
         struct p80211msg_dot11req_mibset msg;
-        p80211item_pstr32_t *mibitem =
-                        (p80211item_pstr32_t *)&msg.mibattribute.data;
+        struct p80211item_pstr32 *mibitem =
+                        (struct p80211item_pstr32 *)&msg.mibattribute.data;
 
         msg.msgcode = DIDmsg_dot11req_mibset;
         mibitem->did = did;
diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h
index c9d4bb5a9b5f..c66fc5addbb2 100644
--- a/drivers/staging/wlan-ng/p80211metastruct.h
+++ b/drivers/staging/wlan-ng/p80211metastruct.h
@@ -70,7 +70,7 @@ struct p80211msg_dot11req_scan {
         struct p80211item_uint32 bsstype;
         struct p80211item_pstr6 bssid;
         u8 pad_0C[1];
-        p80211item_pstr32_t ssid;
+        struct p80211item_pstr32 ssid;
         u8 pad_1D[3];
         struct p80211item_uint32 scantype;
         struct p80211item_uint32 probedelay;
@@ -93,7 +93,7 @@ struct p80211msg_dot11req_scan_results {
         struct p80211item_uint32 noise;
         struct p80211item_pstr6 bssid;
         u8 pad_3C[1];
-        p80211item_pstr32_t ssid;
+        struct p80211item_pstr32 ssid;
         u8 pad_4D[3];
         struct p80211item_uint32 bsstype;
         struct p80211item_uint32 beaconperiod;
@@ -136,7 +136,7 @@ struct p80211msg_dot11req_start {
         u32 msgcode;
         u32 msglen;
         u8 devname[WLAN_DEVNAMELEN_MAX];
-        p80211item_pstr32_t ssid;
+        struct p80211item_pstr32 ssid;
         u8 pad_12D[3];
         struct p80211item_uint32 bsstype;
         struct p80211item_uint32 beaconperiod;
@@ -217,7 +217,7 @@ struct p80211msg_lnxreq_autojoin {
         u32 msgcode;
         u32 msglen;
         u8 devname[WLAN_DEVNAMELEN_MAX];
-        p80211item_pstr32_t ssid;
+        struct p80211item_pstr32 ssid;
         u8 pad_19D[3];
         struct p80211item_uint32 authtype;
         struct p80211item_uint32 resultcode;
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index 4d70d8405c75..6c877292c209 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -294,12 +294,12 @@ struct p80211item_pstr14 {
 } __packed;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
-typedef struct p80211item_pstr32 {
+struct p80211item_pstr32 {
         u32 did;
         u16 status;
         u16 len;
         struct p80211pstr32 data;
-} __packed p80211item_pstr32_t;
+} __packed;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr255 {