Re: [PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-23 Thread Sergio Paracuellos

Drop it, please. It seems I wrongly included the original patch too.

Sorry for inconvenience.

Thanks,
Sergio Paracuellos

El 2016年09月23日 a las 18:59, Greg KH escribió:

On Fri, Sep 23, 2016 at 03:45:18PM +0200, Sergio Paracuellos wrote:

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

Signed-off-by: Sergio Paracuellos 
---


Was this patch part of this series?  It didn't have a number, so I'm
dropping it...

thanks,

greg k-h



Re: [PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-23 Thread Sergio Paracuellos

Drop it, please. It seems I wrongly included the original patch too.

Sorry for inconvenience.

Thanks,
Sergio Paracuellos

El 2016年09月23日 a las 18:59, Greg KH escribió:

On Fri, Sep 23, 2016 at 03:45:18PM +0200, Sergio Paracuellos wrote:

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

Signed-off-by: Sergio Paracuellos 
---


Was this patch part of this series?  It didn't have a number, so I'm
dropping it...

thanks,

greg k-h



Re: [PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-23 Thread Greg KH
On Fri, Sep 23, 2016 at 03:45:18PM +0200, Sergio Paracuellos wrote:
> This patch fixes the following checkpatch.pl warning in p80211types.h:
> WARNING: do not add new typedefs
> 
> Signed-off-by: Sergio Paracuellos 
> ---

Was this patch part of this series?  It didn't have a number, so I'm
dropping it...

thanks,

greg k-h


Re: [PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-23 Thread Greg KH
On Fri, Sep 23, 2016 at 03:45:18PM +0200, Sergio Paracuellos wrote:
> This patch fixes the following checkpatch.pl warning in p80211types.h:
> WARNING: do not add new typedefs
> 
> Signed-off-by: Sergio Paracuellos 
> ---

Was this patch part of this series?  It didn't have a number, so I'm
dropping it...

thanks,

greg k-h


[PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-23 Thread Sergio Paracuellos
This patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs

Signed-off-by: Sergio Paracuellos 
---
 drivers/staging/wlan-ng/cfg80211.c |  12 +-
 drivers/staging/wlan-ng/p80211metastruct.h | 248 ++---
 drivers/staging/wlan-ng/p80211netdev.c |   8 +-
 drivers/staging/wlan-ng/p80211netdev.h |   2 +-
 drivers/staging/wlan-ng/p80211req.c|   7 +-
 drivers/staging/wlan-ng/p80211types.h  | 126 +++
 drivers/staging/wlan-ng/prism2fw.c |   4 +-
 drivers/staging/wlan-ng/prism2mgmt.c   |   8 +-
 drivers/staging/wlan-ng/prism2mgmt.h   |  10 +-
 drivers/staging/wlan-ng/prism2mib.c|  16 +-
 drivers/staging/wlan-ng/prism2sta.c|   8 +-
 11 files changed, 225 insertions(+), 224 deletions(-)

diff --git a/drivers/staging/wlan-ng/cfg80211.c 
b/drivers/staging/wlan-ng/cfg80211.c
index 8c592be..aa04395 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -72,8 +72,8 @@ static int prism2_result2err(int prism2_result)
 static int prism2_domibset_uint32(struct wlandevice *wlandev, u32 did, u32 
data)
 {
struct p80211msg_dot11req_mibset msg;
-   p80211item_uint32_t *mibitem =
-   (p80211item_uint32_t *)
+   struct p80211item_uint32 *mibitem =
+   (struct p80211item_uint32 *)
 
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
@@ -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 *)
+   struct p80211item_pstr32 *mibitem =
+   (struct p80211item_pstr32 *)
 
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
@@ -626,11 +626,11 @@ static int prism2_get_tx_power(struct wiphy *wiphy, 
struct wireless_dev *wdev,
struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
struct wlandevice *wlandev = priv->wlandev;
struct p80211msg_dot11req_mibget msg;
-   p80211item_uint32_t *mibitem;
+   struct p80211item_uint32 *mibitem;
int result;
int err = 0;
 
-   mibitem = (p80211item_uint32_t *)
+   mibitem = (struct p80211item_uint32 *)
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem->did =
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
diff --git a/drivers/staging/wlan-ng/p80211metastruct.h 
b/drivers/staging/wlan-ng/p80211metastruct.h
index c501162..c454471 100644
--- a/drivers/staging/wlan-ng/p80211metastruct.h
+++ b/drivers/staging/wlan-ng/p80211metastruct.h
@@ -51,221 +51,221 @@ struct p80211msg_dot11req_mibget {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_unk392_t mibattribute;
-   p80211item_uint32_t resultcode;
+   struct p80211item_unk392 mibattribute;
+   struct p80211item_uint32 resultcode;
 } __packed;
 
 struct p80211msg_dot11req_mibset {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_unk392_t mibattribute;
-   p80211item_uint32_t resultcode;
+   struct p80211item_unk392 mibattribute;
+   struct p80211item_uint32 resultcode;
 } __packed;
 
 struct p80211msg_dot11req_scan {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_uint32_t bsstype;
-   p80211item_pstr6_t bssid;
+   struct p80211item_uint32 bsstype;
+   struct p80211item_pstr6 bssid;
u8 pad_0C[1];
-   p80211item_pstr32_t ssid;
+   struct p80211item_pstr32 ssid;
u8 pad_1D[3];
-   p80211item_uint32_t scantype;
-   p80211item_uint32_t probedelay;
-   p80211item_pstr14_t channellist;
+   struct p80211item_uint32 scantype;
+   struct p80211item_uint32 probedelay;
+   struct p80211item_pstr14 channellist;
u8 pad_2C[1];
-   p80211item_uint32_t minchanneltime;
-   p80211item_uint32_t maxchanneltime;
-   p80211item_uint32_t resultcode;
-   p80211item_uint32_t numbss;
-   p80211item_uint32_t append;
+   struct p80211item_uint32 minchanneltime;
+   struct p80211item_uint32 maxchanneltime;
+   struct p80211item_uint32 resultcode;
+   struct p80211item_uint32 numbss;
+   struct p80211item_uint32 append;
 } __packed;
 
 struct p80211msg_dot11req_scan_results {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_uint32_t bssindex;
-   p80211item_uint32_t resultcode;
-   p80211item_uint32_t signal;
-   p80211item_uint32_t noise;
-   p80211item_pstr6_t bssid;
+   struct p80211item_uint32 bssindex;
+   struct p80211item_uint32 resultcode;
+   struct p80211item_uint32 signal;
+   

[PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-23 Thread Sergio Paracuellos
This patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs

Signed-off-by: Sergio Paracuellos 
---
 drivers/staging/wlan-ng/cfg80211.c |  12 +-
 drivers/staging/wlan-ng/p80211metastruct.h | 248 ++---
 drivers/staging/wlan-ng/p80211netdev.c |   8 +-
 drivers/staging/wlan-ng/p80211netdev.h |   2 +-
 drivers/staging/wlan-ng/p80211req.c|   7 +-
 drivers/staging/wlan-ng/p80211types.h  | 126 +++
 drivers/staging/wlan-ng/prism2fw.c |   4 +-
 drivers/staging/wlan-ng/prism2mgmt.c   |   8 +-
 drivers/staging/wlan-ng/prism2mgmt.h   |  10 +-
 drivers/staging/wlan-ng/prism2mib.c|  16 +-
 drivers/staging/wlan-ng/prism2sta.c|   8 +-
 11 files changed, 225 insertions(+), 224 deletions(-)

diff --git a/drivers/staging/wlan-ng/cfg80211.c 
b/drivers/staging/wlan-ng/cfg80211.c
index 8c592be..aa04395 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -72,8 +72,8 @@ static int prism2_result2err(int prism2_result)
 static int prism2_domibset_uint32(struct wlandevice *wlandev, u32 did, u32 
data)
 {
struct p80211msg_dot11req_mibset msg;
-   p80211item_uint32_t *mibitem =
-   (p80211item_uint32_t *)
+   struct p80211item_uint32 *mibitem =
+   (struct p80211item_uint32 *)
 
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
@@ -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 *)
+   struct p80211item_pstr32 *mibitem =
+   (struct p80211item_pstr32 *)
 
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
@@ -626,11 +626,11 @@ static int prism2_get_tx_power(struct wiphy *wiphy, 
struct wireless_dev *wdev,
struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
struct wlandevice *wlandev = priv->wlandev;
struct p80211msg_dot11req_mibget msg;
-   p80211item_uint32_t *mibitem;
+   struct p80211item_uint32 *mibitem;
int result;
int err = 0;
 
-   mibitem = (p80211item_uint32_t *)
+   mibitem = (struct p80211item_uint32 *)
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem->did =
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
diff --git a/drivers/staging/wlan-ng/p80211metastruct.h 
b/drivers/staging/wlan-ng/p80211metastruct.h
index c501162..c454471 100644
--- a/drivers/staging/wlan-ng/p80211metastruct.h
+++ b/drivers/staging/wlan-ng/p80211metastruct.h
@@ -51,221 +51,221 @@ struct p80211msg_dot11req_mibget {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_unk392_t mibattribute;
-   p80211item_uint32_t resultcode;
+   struct p80211item_unk392 mibattribute;
+   struct p80211item_uint32 resultcode;
 } __packed;
 
 struct p80211msg_dot11req_mibset {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_unk392_t mibattribute;
-   p80211item_uint32_t resultcode;
+   struct p80211item_unk392 mibattribute;
+   struct p80211item_uint32 resultcode;
 } __packed;
 
 struct p80211msg_dot11req_scan {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_uint32_t bsstype;
-   p80211item_pstr6_t bssid;
+   struct p80211item_uint32 bsstype;
+   struct p80211item_pstr6 bssid;
u8 pad_0C[1];
-   p80211item_pstr32_t ssid;
+   struct p80211item_pstr32 ssid;
u8 pad_1D[3];
-   p80211item_uint32_t scantype;
-   p80211item_uint32_t probedelay;
-   p80211item_pstr14_t channellist;
+   struct p80211item_uint32 scantype;
+   struct p80211item_uint32 probedelay;
+   struct p80211item_pstr14 channellist;
u8 pad_2C[1];
-   p80211item_uint32_t minchanneltime;
-   p80211item_uint32_t maxchanneltime;
-   p80211item_uint32_t resultcode;
-   p80211item_uint32_t numbss;
-   p80211item_uint32_t append;
+   struct p80211item_uint32 minchanneltime;
+   struct p80211item_uint32 maxchanneltime;
+   struct p80211item_uint32 resultcode;
+   struct p80211item_uint32 numbss;
+   struct p80211item_uint32 append;
 } __packed;
 
 struct p80211msg_dot11req_scan_results {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_uint32_t bssindex;
-   p80211item_uint32_t resultcode;
-   p80211item_uint32_t signal;
-   p80211item_uint32_t noise;
-   p80211item_pstr6_t bssid;
+   struct p80211item_uint32 bssindex;
+   struct p80211item_uint32 resultcode;
+   struct p80211item_uint32 signal;
+   struct p80211item_uint32 noise;
+  

Re: [PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-23 Thread Greg KH
On Fri, Sep 23, 2016 at 06:46:55AM +0200, Sergio Paracuellos wrote:
> This patch fixes the following checkpatch.pl warning in p80211types.h:
> WARNING: do not add new typedefs
> 
> Signed-off-by: Sergio Paracuellos 
> ---
>  drivers/staging/wlan-ng/cfg80211.c |  12 +-
>  drivers/staging/wlan-ng/p80211metastruct.h | 248 
> ++---
>  drivers/staging/wlan-ng/p80211netdev.c |   8 +-
>  drivers/staging/wlan-ng/p80211netdev.h |   2 +-
>  drivers/staging/wlan-ng/p80211req.c|   7 +-
>  drivers/staging/wlan-ng/p80211types.h  | 126 +++
>  drivers/staging/wlan-ng/prism2fw.c |   4 +-
>  drivers/staging/wlan-ng/prism2mgmt.c   |   8 +-
>  drivers/staging/wlan-ng/prism2mgmt.h   |  10 +-
>  drivers/staging/wlan-ng/prism2mib.c|  16 +-
>  drivers/staging/wlan-ng/prism2sta.c|   8 +-
>  11 files changed, 225 insertions(+), 224 deletions(-)

Can you please do this one typedef at a time, as a patch series?

thanks,

reg k-h


Re: [PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-23 Thread Greg KH
On Fri, Sep 23, 2016 at 06:46:55AM +0200, Sergio Paracuellos wrote:
> This patch fixes the following checkpatch.pl warning in p80211types.h:
> WARNING: do not add new typedefs
> 
> Signed-off-by: Sergio Paracuellos 
> ---
>  drivers/staging/wlan-ng/cfg80211.c |  12 +-
>  drivers/staging/wlan-ng/p80211metastruct.h | 248 
> ++---
>  drivers/staging/wlan-ng/p80211netdev.c |   8 +-
>  drivers/staging/wlan-ng/p80211netdev.h |   2 +-
>  drivers/staging/wlan-ng/p80211req.c|   7 +-
>  drivers/staging/wlan-ng/p80211types.h  | 126 +++
>  drivers/staging/wlan-ng/prism2fw.c |   4 +-
>  drivers/staging/wlan-ng/prism2mgmt.c   |   8 +-
>  drivers/staging/wlan-ng/prism2mgmt.h   |  10 +-
>  drivers/staging/wlan-ng/prism2mib.c|  16 +-
>  drivers/staging/wlan-ng/prism2sta.c|   8 +-
>  11 files changed, 225 insertions(+), 224 deletions(-)

Can you please do this one typedef at a time, as a patch series?

thanks,

reg k-h


[PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-22 Thread Sergio Paracuellos
This patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs

Signed-off-by: Sergio Paracuellos 
---
 drivers/staging/wlan-ng/cfg80211.c |  12 +-
 drivers/staging/wlan-ng/p80211metastruct.h | 248 ++---
 drivers/staging/wlan-ng/p80211netdev.c |   8 +-
 drivers/staging/wlan-ng/p80211netdev.h |   2 +-
 drivers/staging/wlan-ng/p80211req.c|   7 +-
 drivers/staging/wlan-ng/p80211types.h  | 126 +++
 drivers/staging/wlan-ng/prism2fw.c |   4 +-
 drivers/staging/wlan-ng/prism2mgmt.c   |   8 +-
 drivers/staging/wlan-ng/prism2mgmt.h   |  10 +-
 drivers/staging/wlan-ng/prism2mib.c|  16 +-
 drivers/staging/wlan-ng/prism2sta.c|   8 +-
 11 files changed, 225 insertions(+), 224 deletions(-)

diff --git a/drivers/staging/wlan-ng/cfg80211.c 
b/drivers/staging/wlan-ng/cfg80211.c
index 8c592be..aa04395 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -72,8 +72,8 @@ static int prism2_result2err(int prism2_result)
 static int prism2_domibset_uint32(struct wlandevice *wlandev, u32 did, u32 
data)
 {
struct p80211msg_dot11req_mibset msg;
-   p80211item_uint32_t *mibitem =
-   (p80211item_uint32_t *)
+   struct p80211item_uint32 *mibitem =
+   (struct p80211item_uint32 *)
 
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
@@ -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 *)
+   struct p80211item_pstr32 *mibitem =
+   (struct p80211item_pstr32 *)
 
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
@@ -626,11 +626,11 @@ static int prism2_get_tx_power(struct wiphy *wiphy, 
struct wireless_dev *wdev,
struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
struct wlandevice *wlandev = priv->wlandev;
struct p80211msg_dot11req_mibget msg;
-   p80211item_uint32_t *mibitem;
+   struct p80211item_uint32 *mibitem;
int result;
int err = 0;
 
-   mibitem = (p80211item_uint32_t *)
+   mibitem = (struct p80211item_uint32 *)
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem->did =
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
diff --git a/drivers/staging/wlan-ng/p80211metastruct.h 
b/drivers/staging/wlan-ng/p80211metastruct.h
index c501162..c454471 100644
--- a/drivers/staging/wlan-ng/p80211metastruct.h
+++ b/drivers/staging/wlan-ng/p80211metastruct.h
@@ -51,221 +51,221 @@ struct p80211msg_dot11req_mibget {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_unk392_t mibattribute;
-   p80211item_uint32_t resultcode;
+   struct p80211item_unk392 mibattribute;
+   struct p80211item_uint32 resultcode;
 } __packed;
 
 struct p80211msg_dot11req_mibset {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_unk392_t mibattribute;
-   p80211item_uint32_t resultcode;
+   struct p80211item_unk392 mibattribute;
+   struct p80211item_uint32 resultcode;
 } __packed;
 
 struct p80211msg_dot11req_scan {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_uint32_t bsstype;
-   p80211item_pstr6_t bssid;
+   struct p80211item_uint32 bsstype;
+   struct p80211item_pstr6 bssid;
u8 pad_0C[1];
-   p80211item_pstr32_t ssid;
+   struct p80211item_pstr32 ssid;
u8 pad_1D[3];
-   p80211item_uint32_t scantype;
-   p80211item_uint32_t probedelay;
-   p80211item_pstr14_t channellist;
+   struct p80211item_uint32 scantype;
+   struct p80211item_uint32 probedelay;
+   struct p80211item_pstr14 channellist;
u8 pad_2C[1];
-   p80211item_uint32_t minchanneltime;
-   p80211item_uint32_t maxchanneltime;
-   p80211item_uint32_t resultcode;
-   p80211item_uint32_t numbss;
-   p80211item_uint32_t append;
+   struct p80211item_uint32 minchanneltime;
+   struct p80211item_uint32 maxchanneltime;
+   struct p80211item_uint32 resultcode;
+   struct p80211item_uint32 numbss;
+   struct p80211item_uint32 append;
 } __packed;
 
 struct p80211msg_dot11req_scan_results {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_uint32_t bssindex;
-   p80211item_uint32_t resultcode;
-   p80211item_uint32_t signal;
-   p80211item_uint32_t noise;
-   p80211item_pstr6_t bssid;
+   struct p80211item_uint32 bssindex;
+   struct p80211item_uint32 resultcode;
+   struct p80211item_uint32 signal;
+   

[PATCH] staging: wlan-ng: avoid to introduce new typedefs

2016-09-22 Thread Sergio Paracuellos
This patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs

Signed-off-by: Sergio Paracuellos 
---
 drivers/staging/wlan-ng/cfg80211.c |  12 +-
 drivers/staging/wlan-ng/p80211metastruct.h | 248 ++---
 drivers/staging/wlan-ng/p80211netdev.c |   8 +-
 drivers/staging/wlan-ng/p80211netdev.h |   2 +-
 drivers/staging/wlan-ng/p80211req.c|   7 +-
 drivers/staging/wlan-ng/p80211types.h  | 126 +++
 drivers/staging/wlan-ng/prism2fw.c |   4 +-
 drivers/staging/wlan-ng/prism2mgmt.c   |   8 +-
 drivers/staging/wlan-ng/prism2mgmt.h   |  10 +-
 drivers/staging/wlan-ng/prism2mib.c|  16 +-
 drivers/staging/wlan-ng/prism2sta.c|   8 +-
 11 files changed, 225 insertions(+), 224 deletions(-)

diff --git a/drivers/staging/wlan-ng/cfg80211.c 
b/drivers/staging/wlan-ng/cfg80211.c
index 8c592be..aa04395 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -72,8 +72,8 @@ static int prism2_result2err(int prism2_result)
 static int prism2_domibset_uint32(struct wlandevice *wlandev, u32 did, u32 
data)
 {
struct p80211msg_dot11req_mibset msg;
-   p80211item_uint32_t *mibitem =
-   (p80211item_uint32_t *)
+   struct p80211item_uint32 *mibitem =
+   (struct p80211item_uint32 *)
 
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
@@ -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 *)
+   struct p80211item_pstr32 *mibitem =
+   (struct p80211item_pstr32 *)
 
msg.msgcode = DIDmsg_dot11req_mibset;
mibitem->did = did;
@@ -626,11 +626,11 @@ static int prism2_get_tx_power(struct wiphy *wiphy, 
struct wireless_dev *wdev,
struct prism2_wiphy_private *priv = wiphy_priv(wiphy);
struct wlandevice *wlandev = priv->wlandev;
struct p80211msg_dot11req_mibget msg;
-   p80211item_uint32_t *mibitem;
+   struct p80211item_uint32 *mibitem;
int result;
int err = 0;
 
-   mibitem = (p80211item_uint32_t *)
+   mibitem = (struct p80211item_uint32 *)
msg.msgcode = DIDmsg_dot11req_mibget;
mibitem->did =
DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
diff --git a/drivers/staging/wlan-ng/p80211metastruct.h 
b/drivers/staging/wlan-ng/p80211metastruct.h
index c501162..c454471 100644
--- a/drivers/staging/wlan-ng/p80211metastruct.h
+++ b/drivers/staging/wlan-ng/p80211metastruct.h
@@ -51,221 +51,221 @@ struct p80211msg_dot11req_mibget {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_unk392_t mibattribute;
-   p80211item_uint32_t resultcode;
+   struct p80211item_unk392 mibattribute;
+   struct p80211item_uint32 resultcode;
 } __packed;
 
 struct p80211msg_dot11req_mibset {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_unk392_t mibattribute;
-   p80211item_uint32_t resultcode;
+   struct p80211item_unk392 mibattribute;
+   struct p80211item_uint32 resultcode;
 } __packed;
 
 struct p80211msg_dot11req_scan {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_uint32_t bsstype;
-   p80211item_pstr6_t bssid;
+   struct p80211item_uint32 bsstype;
+   struct p80211item_pstr6 bssid;
u8 pad_0C[1];
-   p80211item_pstr32_t ssid;
+   struct p80211item_pstr32 ssid;
u8 pad_1D[3];
-   p80211item_uint32_t scantype;
-   p80211item_uint32_t probedelay;
-   p80211item_pstr14_t channellist;
+   struct p80211item_uint32 scantype;
+   struct p80211item_uint32 probedelay;
+   struct p80211item_pstr14 channellist;
u8 pad_2C[1];
-   p80211item_uint32_t minchanneltime;
-   p80211item_uint32_t maxchanneltime;
-   p80211item_uint32_t resultcode;
-   p80211item_uint32_t numbss;
-   p80211item_uint32_t append;
+   struct p80211item_uint32 minchanneltime;
+   struct p80211item_uint32 maxchanneltime;
+   struct p80211item_uint32 resultcode;
+   struct p80211item_uint32 numbss;
+   struct p80211item_uint32 append;
 } __packed;
 
 struct p80211msg_dot11req_scan_results {
u32 msgcode;
u32 msglen;
u8 devname[WLAN_DEVNAMELEN_MAX];
-   p80211item_uint32_t bssindex;
-   p80211item_uint32_t resultcode;
-   p80211item_uint32_t signal;
-   p80211item_uint32_t noise;
-   p80211item_pstr6_t bssid;
+   struct p80211item_uint32 bssindex;
+   struct p80211item_uint32 resultcode;
+   struct p80211item_uint32 signal;
+   struct p80211item_uint32 noise;
+