diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h
index c29988ec113155f7f465064d5bd697573ad6f73c..97ef2ef35f084ce0e5b6b41a3368a83697eede41 100644
--- a/drivers/staging/wlan-ng/p80211metastruct.h
+++ b/drivers/staging/wlan-ng/p80211metastruct.h
@@ -68,7 +68,7 @@ struct p80211msg_dot11req_scan {
 	u32 msglen;
 	u8 devname[WLAN_DEVNAMELEN_MAX];
 	struct p80211item_uint32 bsstype;
-	p80211item_pstr6_t bssid;
+	struct p80211item_pstr6 bssid;
 	u8 pad_0C[1];
 	p80211item_pstr32_t ssid;
 	u8 pad_1D[3];
@@ -91,7 +91,7 @@ struct p80211msg_dot11req_scan_results {
 	struct p80211item_uint32 resultcode;
 	struct p80211item_uint32 signal;
 	struct p80211item_uint32 noise;
-	p80211item_pstr6_t bssid;
+	struct p80211item_pstr6 bssid;
 	u8 pad_3C[1];
 	p80211item_pstr32_t ssid;
 	u8 pad_4D[3];
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index 5244bd8649dc03feb3d478e2c62453a79472f631..d71bd7edf6b29e6362953b8afac67dfaff1ac17b 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -615,7 +615,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
 	struct sockaddr *new_addr = addr;
 	struct p80211msg_dot11req_mibset dot11req;
 	p80211item_unk392_t *mibattr;
-	p80211item_pstr6_t *macaddr;
+	struct p80211item_pstr6 *macaddr;
 	struct p80211item_uint32 *resultcode;
 	int result;
 
@@ -625,7 +625,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
 
 	/* Set up some convenience pointers. */
 	mibattr = &dot11req.mibattribute;
-	macaddr = (p80211item_pstr6_t *)&mibattr->data;
+	macaddr = (struct p80211item_pstr6 *)&mibattr->data;
 	resultcode = &dot11req.resultcode;
 
 	/* Set up a dot11req_mibset */
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h
index 13962ec9e83b83c41a93a810db819d4ddaa5a67b..9a09cce018be139b743f35d6968de3e1ae684224 100644
--- a/drivers/staging/wlan-ng/p80211types.h
+++ b/drivers/staging/wlan-ng/p80211types.h
@@ -278,12 +278,12 @@ struct p80211item_uint32 {
 } __packed;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
-typedef struct p80211item_pstr6 {
+struct p80211item_pstr6 {
 	u32 did;
 	u16 status;
 	u16 len;
 	struct p80211pstr6 data;
-} __packed p80211item_pstr6_t;
+} __packed;
 
 /* message data item for OCTETSTR, DISPLAYSTR */
 typedef struct p80211item_pstr14 {