staging: wlan-ng: fix some style issues in p80211types.h
cover staging: wlan-ng: fix some style issues in p80211types.h
This patchset fix some style issues reported by checkpatch.pl script.
Sergio Paracuellos (20):
staging: wlan-ng: avoid new typedef: p80211enumpair_t
staging: wlan-ng: avoid new typedef: p80211enum_t
staging: wlan-ng: avoid new typedef: p80211pstr_t
staging: wlan-ng: avoid new typedef: p80211pstrd_t
staging: wlan-ng: avoid new typedef: p80211pstr255_t
staging: wlan-ng: avoid new typedef: p80211pstr6_t
staging: wlan-ng: avoid new typedef: p80211pstr14_t
staging: wlan-ng: avoid new typedef: p80211pstr32_t
staging: wlan-ng: avoid new typedef: p80211macarray_t
staging: wlan-ng: avoid new typedef: p80211item_t
staging: wlan-ng: avoid new typedef: p80211itemd_t
staging: wlan-ng: avoid new typedef: p80211item_uint32_t
staging: wlan-ng: avoid new typedef: p80211item_pstr6_t
staging: wlan-ng: avoid new typedef: p80211item_pstr14_t
staging: wlan-ng: avoid new typedef: p80211item_pstr32_t
staging: wlan-ng: avoid new typedef: p80211item_pstr255_t
staging: wlan-ng: avoid new typedef: p80211item_unk392_t
staging: wlan-ng: avoid new typedef: p80211item_unk1024_t
staging: wlan-ng: avoid new typedef: p80211item_unk4096_t
staging: wlan-ng: fix block comments style errors
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 | 261 +++++++++++++++-------------- 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, 293 insertions(+), 291 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/20 staging: wlan-ng: avoid new typedef: p80211enumpair_t
This patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211enumpair_t.
--- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -200,14 +200,14 @@/* The following structure types are used for the representation */ /* of ENUMint type metadata. */ -typedef struct p80211enumpair { +struct p80211enumpair {u32 val;char *name; -}p80211enumpair_t ; +};typedef struct p80211enum {int nitems; -p80211enumpair_t *list; +struct p80211enumpair *list; }p80211enum_t ;/*----------------------------------------------------------------*/
Signature · 1 line
1.9.1
PATCH 2/20 staging: wlan-ng: avoid new typedef: p80211enum_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211enum_t.
--- drivers/staging/wlan-ng/p80211types.h | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/staging/wlan-ng/p80211types.h +22 -22
@@ -205,10 +205,10 @@ struct p80211enumpair {char *name; }; -typedef struct p80211enum { +struct p80211enum {int nitems;struct p80211enumpair *list; -}p80211enum_t ; +};/*----------------------------------------------------------------*/ /* The following structure types are used to store data items in */
@@ -351,25 +351,25 @@ typedef void (*p80211_fromtext_t) (struct catlistitem *, u32 did, u8 *itembuf,/* The following are the external declarations */ /* for all enumerations */ -extern p80211enum_t MKENUMNAME (truth ); -extern p80211enum_t MKENUMNAME (ifstate ); -extern p80211enum_t MKENUMNAME (powermgmt ); -extern p80211enum_t MKENUMNAME (bsstype ); -extern p80211enum_t MKENUMNAME (authalg ); -extern p80211enum_t MKENUMNAME (phytype ); -extern p80211enum_t MKENUMNAME (temptype ); -extern p80211enum_t MKENUMNAME (regdomain ); -extern p80211enum_t MKENUMNAME (ccamode ); -extern p80211enum_t MKENUMNAME (diversity ); -extern p80211enum_t MKENUMNAME (scantype ); -extern p80211enum_t MKENUMNAME (resultcode ); -extern p80211enum_t MKENUMNAME (reason ); -extern p80211enum_t MKENUMNAME (status ); -extern p80211enum_t MKENUMNAME (msgcode ); -extern p80211enum_t MKENUMNAME (msgitem_status ); - -extern p80211enum_t MKENUMNAME (lnxroam_reason ); - -extern p80211enum_t MKENUMNAME (p2preamble ); +extern struct p80211enum MKENUMNAME (truth ); +extern struct p80211enum MKENUMNAME (ifstate ); +extern struct p80211enum MKENUMNAME (powermgmt ); +extern struct p80211enum MKENUMNAME (bsstype ); +extern struct p80211enum MKENUMNAME (authalg ); +extern struct p80211enum MKENUMNAME (phytype ); +extern struct p80211enum MKENUMNAME (temptype ); +extern struct p80211enum MKENUMNAME (regdomain ); +extern struct p80211enum MKENUMNAME (ccamode ); +extern struct p80211enum MKENUMNAME (diversity ); +extern struct p80211enum MKENUMNAME (scantype ); +extern struct p80211enum MKENUMNAME (resultcode ); +extern struct p80211enum MKENUMNAME (reason ); +extern struct p80211enum MKENUMNAME (status ); +extern struct p80211enum MKENUMNAME (msgcode ); +extern struct p80211enum MKENUMNAME (msgitem_status ); + +extern struct p80211enum MKENUMNAME (lnxroam_reason ); + +extern struct p80211enum MKENUMNAME (p2preamble );#endif /* _P80211TYPES_H */
Signature · 1 line
1.9.1
PATCH 3/20 staging: wlan-ng: avoid new typedef: p80211pstr_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr_t
--- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -215,9 +215,9 @@ struct p80211enum {/* messages. */ /* Template pascal string */ -typedef struct p80211pstr { +struct p80211pstr {u8 len; -} __packed p80211pstr_t; +} __packed; typedef struct p80211pstrd { u8 len;
Signature · 1 line
1.9.1
PATCH 4/20 staging: wlan-ng: avoid new typedef: p80211pstrd_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstrd_t
--- drivers/staging/wlan-ng/p80211req.c | 4 ++-- drivers/staging/wlan-ng/p80211types.h | 4 ++-- drivers/staging/wlan-ng/prism2mgmt.c | 8 ++++---- drivers/staging/wlan-ng/prism2mgmt.h | 10 +++++----- drivers/staging/wlan-ng/prism2mib.c | 12 ++++++------ drivers/staging/wlan-ng/prism2sta.c | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-)
drivers/staging/wlan-ng/p80211req.c +2 -2
@@ -196,8 +196,8 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev, int isget) {p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data; -p80211pstrd_t *pstr = (p80211pstrd_t *) mibitem->data; -u8 *key = mibitem->data +sizeof (p80211pstrd_t); +struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data; +u8 *key = mibitem->data +sizeof (struct p80211pstrd );switch (mibitem->did) {case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key (1 ):
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -219,10 +219,10 @@ struct p80211pstr {u8 len; } __packed; -typedef struct p80211pstrd { +struct p80211pstrd {u8 len;u8 data[0 ]; -} __packed p80211pstrd_t; +} __packed;/* Maximum pascal string */ typedef struct p80211pstr255 {
drivers/staging/wlan-ng/prism2mgmt.c +4 -4
@@ -531,7 +531,7 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)hfa384x_t *hw = wlandev->priv;struct p80211msg_dot11req_start *msg = msgp; -p80211pstrd_t *pstr; +struct p80211pstrd *pstr;u8 bytebuf[80 ];struct hfa384x_bytestr *p2bytestr = (struct hfa384x_bytestr *) bytebuf;u16 word;
@@ -558,7 +558,7 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)/*** STATION ***/ /* Set the REQUIRED config items */ /* SSID */ - pstr = (p80211pstrd_t *) &(msg->ssid.data); + pstr = (struct p80211pstrd *)&msg->ssid.data;prism2mgmt_pstr2bytestr (p2bytestr, pstr); result =hfa384x_drvr_setconfig (hw, HFA384x_RID_CNFOWNSSID, bytebuf, HFA384x_RID_CNFOWNSSID_LEN);
@@ -1026,7 +1026,7 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)u16 reg;u16 port_type;struct p80211msg_lnxreq_autojoin *msg = msgp; -p80211pstrd_t *pstr; +struct p80211pstrd *pstr;u8 bytebuf[256 ];struct hfa384x_bytestr *p2bytestr = (struct hfa384x_bytestr *) bytebuf;
@@ -1052,7 +1052,7 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)/* Set the ssid */ memset (bytebuf,0 ,256 ); - pstr = (p80211pstrd_t *) &(msg->ssid.data); + pstr = (struct p80211pstrd *)&msg->ssid.data;prism2mgmt_pstr2bytestr (p2bytestr, pstr); result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFDESIREDSSID, bytebuf,
drivers/staging/wlan-ng/prism2mgmt.h +5 -5
@@ -87,18 +87,18 @@* Prism2 data types ---------------------------------------------------------------*/ /* byte area conversion functions*/ -void prism2mgmt_bytearea2pstr (u8 *bytearea,p80211pstrd_t *pstr,int len); +void prism2mgmt_bytearea2pstr (u8 *bytearea,struct p80211pstrd *pstr,int len);/* byte string conversion functions*/ void prism2mgmt_pstr2bytestr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr); +struct p80211pstrd *pstr);void prism2mgmt_bytestr2pstr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr); +struct p80211pstrd *pstr);/* functions to convert Group Addresses */ -void prism2mgmt_get_grpaddr (u32 did,p80211pstrd_t *pstr,hfa384x_t *priv); +void prism2mgmt_get_grpaddr (u32 did,struct p80211pstrd *pstr,hfa384x_t *priv);int prism2mgmt_set_grpaddr (u32 did, -u8 *prism2buf,p80211pstrd_t *pstr, +u8 *prism2buf,struct p80211pstrd *pstr,hfa384x_t *priv);int prism2mgmt_get_grpaddr_index (u32 did);
drivers/staging/wlan-ng/prism2mib.c +6 -6
@@ -379,7 +379,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib, void *data) {int result; -p80211pstrd_t *pstr = data; +struct p80211pstrd *pstr = data;u8 bytebuf[MIB_TMP_MAXLEN ];if (isget) {
@@ -533,7 +533,7 @@ static int prism2mib_wepdefaultkey(struct mibrec *mib, void *data) {int result; -p80211pstrd_t *pstr = data; +struct p80211pstrd *pstr = data;u8 bytebuf[MIB_TMP_MAXLEN ];u16 len;
@@ -705,7 +705,7 @@ static int prism2mib_priv(struct mibrec *mib,hfa384x_t *hw, struct p80211msg_dot11req_mibset *msg, void *data) { - p80211pstrd_t *pstr = data; + struct p80211pstrd *pstr = data;switch (mib->did) {case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
@@ -752,7 +752,7 @@ static int prism2mib_priv(struct mibrec *mib,*/ void prism2mgmt_pstr2bytestr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr) +struct p80211pstrd *pstr) { bytestr->len =cpu_to_le16 ((u16) (pstr->len));memcpy (bytestr->data, pstr->data, pstr->len);
@@ -774,7 +774,7 @@ void prism2mgmt_pstr2bytestr(struct hfa384x_bytestr *bytestr,*/ void prism2mgmt_bytestr2pstr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr) +struct p80211pstrd *pstr) { pstr->len = (u8) (le16_to_cpu ((u16) (bytestr->len)));memcpy (pstr->data, bytestr->data, pstr->len);
@@ -795,7 +795,7 @@ void prism2mgmt_bytestr2pstr(struct hfa384x_bytestr *bytestr,* */ -void prism2mgmt_bytearea2pstr (u8 *bytearea,p80211pstrd_t *pstr,int len) +void prism2mgmt_bytearea2pstr (u8 *bytearea,struct p80211pstrd *pstr,int len) { pstr->len = (u8 ) len;memcpy (pstr->data, bytearea, len);
drivers/staging/wlan-ng/prism2sta.c +3 -3
@@ -1257,7 +1257,7 @@ void prism2sta_processing_defer(struct work_struct *data) }prism2mgmt_bytestr2pstr ( (struct hfa384x_bytestr *) &ssid, - (p80211pstrd_t *) &wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid);/* Collect the port status */ result = hfa384x_drvr_getconfig16(hw,
@@ -1338,7 +1338,7 @@ void prism2sta_processing_defer(struct work_struct *data)return ; }prism2mgmt_bytestr2pstr ((struct hfa384x_bytestr *) &ssid, - (p80211pstrd_t *) &wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid); hw->link_status = HFA384x_LINK_CONNECTED;netif_carrier_on (wlandev->netdev);
@@ -1994,7 +1994,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)return ; }prism2mgmt_bytestr2pstr ((struct hfa384x_bytestr *) &ssid, - (p80211pstrd_t *) &wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid);/* Reschedule timer */ mod_timer (&hw->commsqual_timer, jiffies +HZ );
Signature · 1 line
1.9.1
Greg KH
maintainerRe: [PATCH 04/20] staging: wlan-ng: avoid new typedef: p80211pstrd_t
Quoted 6 lines · Sergio Paracuellos
This patch fixes the following checkpatch.pl warning in
p80211types.h:
WARNING: do not add new typedefsIt applies for typedef
p80211pstrd_tSigned-off-by Sergio Paracuellos <[email protected]>
This patch doesn't apply to the tree, so I had to stop here in the series. Please rebase your tree on mine and resend the remaining patches.
thanks,
greg k-h
v2 cover staging: wlan-ng: fix some style issues in p80211types.h
This patchset fix some style issues reported by checkpatch.pl script.
Changes V2:
- Fix come patches because it doesn¡ t apply correctly to linux tree
Sergio Paracuellos (17):
staging: wlan-ng: avoid new typedef: p80211pstrd_t
staging: wlan-ng: avoid new typedef: p80211pstr255_t
staging: wlan-ng: avoid new typedef: p80211pstr6_t
staging: wlan-ng: avoid new typedef: p80211pstr14_t
staging: wlan-ng: avoid new typedef: p80211pstr32_t
staging: wlan-ng: avoid new typedef: p80211macarray_t
staging: wlan-ng: avoid new typedef: p80211item_t
staging: wlan-ng: avoid new typedef: p80211itemd_t
staging: wlan-ng: avoid new typedef: p80211item_uint32_t
staging: wlan-ng: avoid new typedef: p80211item_pstr6_t
staging: wlan-ng: avoid new typedef: p80211item_pstr14_t
staging: wlan-ng: avoid new typedef: p80211item_pstr32_t
staging: wlan-ng: avoid new typedef: p80211item_pstr255_t
staging: wlan-ng: avoid new typedef: p80211item_unk392_t
staging: wlan-ng: avoid new typedef: p80211item_unk1024_t
staging: wlan-ng: avoid new typedef: p80211item_unk4096_t
staging: wlan-ng: fix block comments style errors
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 | 6 +- drivers/staging/wlan-ng/p80211types.h | 207 ++++++++++++------------ 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, 265 insertions(+), 264 deletions(-)
Signature · 1 line
1.9.1
PATCH v2 1/17 staging: wlan-ng: avoid new typedef: p80211pstrd_t
This patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstrd_t
--- drivers/staging/wlan-ng/p80211req.c | 4 ++-- drivers/staging/wlan-ng/p80211types.h | 4 ++-- drivers/staging/wlan-ng/prism2mgmt.c | 8 ++++---- drivers/staging/wlan-ng/prism2mgmt.h | 10 +++++----- drivers/staging/wlan-ng/prism2mib.c | 12 ++++++------ drivers/staging/wlan-ng/prism2sta.c | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-)
drivers/staging/wlan-ng/p80211req.c +2 -2
@@ -196,8 +196,8 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev, int isget) {p80211itemd_t *mibitem = (p80211itemd_t *)mib_msg->mibattribute.data; -p80211pstrd_t *pstr = (p80211pstrd_t *)mibitem->data; -u8 *key = mibitem->data +sizeof (p80211pstrd_t); +struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data; +u8 *key = mibitem->data +sizeof (struct p80211pstrd );switch (mibitem->did) {case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key (1 ):
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -219,10 +219,10 @@ struct p80211pstr {u8 len; } __packed; -typedef struct p80211pstrd { +struct p80211pstrd {u8 len;u8 data[0 ]; -} __packed p80211pstrd_t; +} __packed;/* Maximum pascal string */ typedef struct p80211pstr255 {
drivers/staging/wlan-ng/prism2mgmt.c +4 -4
@@ -531,7 +531,7 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)hfa384x_t *hw = wlandev->priv;struct p80211msg_dot11req_start *msg = msgp; -p80211pstrd_t *pstr; +struct p80211pstrd *pstr;u8 bytebuf[80 ];struct hfa384x_bytestr *p2bytestr = (struct hfa384x_bytestr *)bytebuf;u16 word;
@@ -558,7 +558,7 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)/*** STATION ***/ /* Set the REQUIRED config items */ /* SSID */ - pstr = (p80211pstrd_t *)&(msg->ssid.data); + pstr = (struct p80211pstrd *)&(msg->ssid.data);prism2mgmt_pstr2bytestr (p2bytestr, pstr); result =hfa384x_drvr_setconfig (hw, HFA384x_RID_CNFOWNSSID, bytebuf, HFA384x_RID_CNFOWNSSID_LEN);
@@ -1026,7 +1026,7 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)u16 reg;u16 port_type;struct p80211msg_lnxreq_autojoin *msg = msgp; -p80211pstrd_t *pstr; +struct p80211pstrd *pstr;u8 bytebuf[256 ];struct hfa384x_bytestr *p2bytestr = (struct hfa384x_bytestr *)bytebuf;
@@ -1052,7 +1052,7 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)/* Set the ssid */ memset (bytebuf,0 ,256 ); - pstr = (p80211pstrd_t *)&(msg->ssid.data); + pstr = (struct p80211pstrd *)&(msg->ssid.data);prism2mgmt_pstr2bytestr (p2bytestr, pstr); result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFDESIREDSSID, bytebuf,
drivers/staging/wlan-ng/prism2mgmt.h +5 -5
@@ -87,18 +87,18 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp);* Prism2 data types ---------------------------------------------------------------*/ /* byte area conversion functions*/ -void prism2mgmt_bytearea2pstr (u8 *bytearea,p80211pstrd_t *pstr,int len); +void prism2mgmt_bytearea2pstr (u8 *bytearea,struct p80211pstrd *pstr,int len);/* byte string conversion functions*/ void prism2mgmt_pstr2bytestr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr); +struct p80211pstrd *pstr);void prism2mgmt_bytestr2pstr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr); +struct p80211pstrd *pstr);/* functions to convert Group Addresses */ -void prism2mgmt_get_grpaddr (u32 did,p80211pstrd_t *pstr,hfa384x_t *priv); +void prism2mgmt_get_grpaddr (u32 did,struct p80211pstrd *pstr,hfa384x_t *priv);int prism2mgmt_set_grpaddr (u32 did, -u8 *prism2buf,p80211pstrd_t *pstr, +u8 *prism2buf,struct p80211pstrd *pstr,hfa384x_t *priv);int prism2mgmt_get_grpaddr_index (u32 did);
drivers/staging/wlan-ng/prism2mib.c +6 -6
@@ -379,7 +379,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib, void *data) {int result; -p80211pstrd_t *pstr = data; +struct p80211pstrd *pstr = data;u8 bytebuf[MIB_TMP_MAXLEN ];if (isget) {
@@ -533,7 +533,7 @@ static int prism2mib_wepdefaultkey(struct mibrec *mib, void *data) {int result; -p80211pstrd_t *pstr = data; +struct p80211pstrd *pstr = data;u8 bytebuf[MIB_TMP_MAXLEN ];u16 len;
@@ -705,7 +705,7 @@ static int prism2mib_priv(struct mibrec *mib,hfa384x_t *hw, struct p80211msg_dot11req_mibset *msg, void *data) { - p80211pstrd_t *pstr = data; + struct p80211pstrd *pstr = data;switch (mib->did) {case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
@@ -752,7 +752,7 @@ static int prism2mib_priv(struct mibrec *mib,*/ void prism2mgmt_pstr2bytestr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr) +struct p80211pstrd *pstr) { bytestr->len =cpu_to_le16 ((u16)(pstr->len));memcpy (bytestr->data, pstr->data, pstr->len);
@@ -774,7 +774,7 @@ void prism2mgmt_pstr2bytestr(struct hfa384x_bytestr *bytestr,*/ void prism2mgmt_bytestr2pstr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr) +struct p80211pstrd *pstr) { pstr->len = (u8)(le16_to_cpu ((u16)(bytestr->len)));memcpy (pstr->data, bytestr->data, pstr->len);
@@ -795,7 +795,7 @@ void prism2mgmt_bytestr2pstr(struct hfa384x_bytestr *bytestr,* */ -void prism2mgmt_bytearea2pstr (u8 *bytearea,p80211pstrd_t *pstr,int len) +void prism2mgmt_bytearea2pstr (u8 *bytearea,struct p80211pstrd *pstr,int len) { pstr->len = (u8 )len;memcpy (pstr->data, bytearea, len);
drivers/staging/wlan-ng/prism2sta.c +3 -3
@@ -1256,7 +1256,7 @@ void prism2sta_processing_defer(struct work_struct *data) }prism2mgmt_bytestr2pstr ( (struct hfa384x_bytestr *)&ssid, - (p80211pstrd_t *)&wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid);/* Collect the port status */ result = hfa384x_drvr_getconfig16(hw,
@@ -1337,7 +1337,7 @@ void prism2sta_processing_defer(struct work_struct *data)return ; }prism2mgmt_bytestr2pstr ((struct hfa384x_bytestr *)&ssid, - (p80211pstrd_t *)&wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid); hw->link_status = HFA384x_LINK_CONNECTED;netif_carrier_on (wlandev->netdev);
@@ -1993,7 +1993,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)return ; }prism2mgmt_bytestr2pstr ((struct hfa384x_bytestr *)&ssid, - (p80211pstrd_t *)&wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid);/* Reschedule timer */ mod_timer (&hw->commsqual_timer, jiffies +HZ );
Signature · 1 line
1.9.1
PATCH v2 2/17 staging: wlan-ng: avoid new typedef: p80211pstr255_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr255_t
--- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -225,10 +225,10 @@ struct p80211pstrd { } __packed;/* Maximum pascal string */ -typedef struct p80211pstr255 { +struct p80211pstr255 {u8 len;u8 data[MAXLEN_PSTR255 ]; -} __packed p80211pstr255_t; +} __packed;/* pascal string for macaddress and bssid */ typedef struct p80211pstr6 {
@@ -306,7 +306,7 @@ typedef struct p80211item_pstr255 {u32 did;u16 status;u16 len; -p80211pstr255_t data; +struct p80211pstr255 data; }__packed p80211item_pstr255_t;/* message data item for UNK 392, namely mib items */
Signature · 1 line
1.9.1
PATCH v2 3/17 staging: wlan-ng: avoid new typedef: p80211pstr6_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr6_t
--- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -231,10 +231,10 @@ struct p80211pstr255 { } __packed;/* pascal string for macaddress and bssid */ -typedef struct p80211pstr6 { +struct p80211pstr6 {u8 len;u8 data[MAXLEN_PSTR6 ]; -} __packed p80211pstr6_t; +} __packed;/* pascal string for channel list */ typedef struct p80211pstr14 {
@@ -282,7 +282,7 @@ typedef struct p80211item_pstr6 {u32 did;u16 status;u16 len; -p80211pstr6_t data; +struct p80211pstr6 data; }__packed p80211item_pstr6_t;/* message data item for OCTETSTR, DISPLAYSTR */
Signature · 1 line
1.9.1
PATCH v2 4/17 staging: wlan-ng: avoid new typedef: p80211pstr14_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr14_t
--- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -237,10 +237,10 @@ struct p80211pstr6 { } __packed;/* pascal string for channel list */ -typedef struct p80211pstr14 { +struct p80211pstr14 {u8 len;u8 data[MAXLEN_PSTR14 ]; -} __packed p80211pstr14_t; +} __packed;/* pascal string for ssid */ typedef struct p80211pstr32 {
@@ -290,7 +290,7 @@ typedef struct p80211item_pstr14 {u32 did;u16 status;u16 len; -p80211pstr14_t data; +struct p80211pstr14 data; }__packed p80211item_pstr14_t;/* message data item for OCTETSTR, DISPLAYSTR */
Signature · 1 line
1.9.1
PATCH v2 5/17 staging: wlan-ng: avoid new typedef: p80211pstr32_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr32_t
--- drivers/staging/wlan-ng/p80211netdev.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/wlan-ng/p80211netdev.h +1 -1
@@ -191,7 +191,7 @@ struct wlandevice {/* 802.11 State */ u8 bssid[WLAN_BSSID_LEN ]; -p80211pstr32_t ssid; +struct p80211pstr32 ssid;u32 macmode;int linkstatus;
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -243,10 +243,10 @@ struct p80211pstr14 { } __packed;/* pascal string for ssid */ -typedef struct p80211pstr32 { +struct p80211pstr32 {u8 len;u8 data[MAXLEN_PSTR32 ]; -} __packed p80211pstr32_t; +} __packed;/* MAC address array */ typedef struct p80211macarray {
@@ -298,7 +298,7 @@ typedef struct p80211item_pstr32 {u32 did;u16 status;u16 len; -p80211pstr32_t data; +struct p80211pstr32 data; }__packed p80211item_pstr32_t;/* message data item for OCTETSTR, DISPLAYSTR */
Signature · 1 line
1.9.1
PATCH v2 6/17 staging: wlan-ng: avoid new typedef: p80211macarray_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211macarray_t
--- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -249,10 +249,10 @@ struct p80211pstr32 { } __packed;/* MAC address array */ -typedef struct p80211macarray { +struct p80211macarray {u32 cnt;u8 data[1 ][MAXLEN_PSTR6 ]; -} __packed p80211macarray_t; +} __packed;/* prototype template */ typedef struct p80211item {
Signature · 1 line
1.9.1
PATCH v2 7/17 staging: wlan-ng: avoid new typedef: p80211item_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_t
--- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -255,11 +255,11 @@ struct p80211macarray { } __packed;/* prototype template */ -typedef struct p80211item { +struct p80211item {u32 did;u16 status;u16 len; -} __packed p80211item_t; +} __packed;/* prototype template w/ data item */ typedef struct p80211itemd {
Signature · 1 line
1.9.1
PATCH v2 8/17 staging: wlan-ng: avoid new typedef: p80211itemd_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211itemd_t
--- drivers/staging/wlan-ng/p80211req.c | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 ++-- drivers/staging/wlan-ng/prism2fw.c | 4 ++-- drivers/staging/wlan-ng/prism2mib.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/wlan-ng/p80211req.c +1 -1
@@ -195,7 +195,7 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev, struct p80211msg_dot11req_mibget *mib_msg, int isget) { -p80211itemd_t *mibitem = (p80211itemd_t *)mib_msg->mibattribute.data; +struct p80211itemd *mibitem = (struct p80211itemd *)mib_msg->mibattribute.data;struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data;u8 *key = mibitem->data +sizeof (struct p80211pstrd );
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -262,12 +262,12 @@ struct p80211item { } __packed;/* prototype template w/ data item */ -typedef struct p80211itemd { +struct p80211itemd {u32 did;u16 status;u16 len;u8 data[0 ]; -} __packed p80211itemd_t; +} __packed;/* message data item for int, BOUNDEDINT, ENUMINT */ typedef struct p80211item_uint32 {
drivers/staging/wlan-ng/prism2fw.c +2 -2
@@ -243,7 +243,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, {signed int result =0 ;struct p80211msg_dot11req_mibget getmsg; -p80211itemd_t *item; +struct p80211itemd *item;u32 *data;/* Initialize the data structures */
@@ -293,7 +293,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, getmsg.resultcode.did = DIDmsg_dot11req_mibget_resultcode; getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value; - item = (p80211itemd_t *)getmsg.mibattribute.data; + item = (struct p80211itemd *)getmsg.mibattribute.data; item->did = DIDmib_p2_p2NIC_p2PRISupRange; item->status = P80211ENUM_msgitem_status_no_value;
drivers/staging/wlan-ng/prism2mib.c +2 -2
@@ -266,7 +266,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)u16 which;struct p80211msg_dot11req_mibset *msg = msgp; -p80211itemd_t *mibitem; +struct p80211itemd *mibitem; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.data = P80211ENUM_resultcode_success;
@@ -284,7 +284,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)** MIB table. */ - mibitem = (p80211itemd_t *)msg->mibattribute.data; + mibitem = (struct p80211itemd *)msg->mibattribute.data;for (mib = mibtab; mib->did !=0 ; mib++)if (mib->did == mibitem->did && (mib->flag & which))
Signature · 1 line
1.9.1
PATCH v2 9/17 staging: wlan-ng: avoid new typedef: p80211item_uint32_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_uint32_t
--- drivers/staging/wlan-ng/cfg80211.c | 8 +- drivers/staging/wlan-ng/p80211metastruct.h | 224 ++++++++++++++--------------- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 +- drivers/staging/wlan-ng/prism2sta.c | 2 +- 5 files changed, 120 insertions(+), 120 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +4 -4
@@ -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 *)&msg.mibattribute.data; +struct p80211item_uint32 *mibitem = + (struct p80211item_uint32 *)&msg.mibattribute.data; 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 *)&msg.mibattribute.data; + mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data; msg.msgcode = DIDmsg_dot11req_mibget; mibitem->did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
drivers/staging/wlan-ng/p80211metastruct.h +112 -112
326 lines not on this page · raw message
drivers/staging/wlan-ng/p80211netdev.c +1 -1
@@ -616,7 +616,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)struct p80211msg_dot11req_mibset dot11req;p80211item_unk392_t *mibattr;p80211item_pstr6_t *macaddr; -p80211item_uint32_t *resultcode; +struct p80211item_uint32 *resultcode;int result;/* If we're running, we don't allow MAC address changes */
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -270,12 +270,12 @@ struct p80211itemd { } __packed;/* message data item for int, BOUNDEDINT, ENUMINT */ -typedef struct p80211item_uint32 { +struct p80211item_uint32 {u32 did;u16 status;u16 len;u32 data; -} __packed p80211item_uint32_t; +} __packed;/* message data item for OCTETSTR, DISPLAYSTR */ typedef struct p80211item_pstr6 {
drivers/staging/wlan-ng/prism2sta.c +1 -1
@@ -1916,7 +1916,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)struct wlandevice *wlandev = hw->wlandev;hfa384x_bytestr32_t ssid;struct p80211msg_dot11req_mibget msg; -p80211item_uint32_t *mibitem = (p80211item_uint32_t *) +struct p80211item_uint32 *mibitem = (struct p80211item_uint32 *) &msg.mibattribute.data;int result =0 ;
Signature · 1 line
1.9.1
PATCH v2 10/17 staging: wlan-ng: avoid new typedef: p80211item_pstr6_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_pstr6_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 4 ++-- drivers/staging/wlan-ng/p80211netdev.c | 4 ++-- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +2 -2
@@ -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 ];
drivers/staging/wlan-ng/p80211netdev.c +2 -2
@@ -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 */
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -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 {
Signature · 1 line
1.9.1
PATCH v2 11/17 staging: wlan-ng: avoid new typedef: p80211item_pstr14_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_pstr14_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +1 -1
@@ -74,7 +74,7 @@ struct p80211msg_dot11req_scan {u8 pad_1D[3 ];struct p80211item_uint32 scantype;struct p80211item_uint32 probedelay; -p80211item_pstr14_t channellist; +struct p80211item_pstr14 channellist;u8 pad_2C[1 ];struct p80211item_uint32 minchanneltime;struct p80211item_uint32 maxchanneltime;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -286,12 +286,12 @@ struct p80211item_pstr6 { } __packed;/* message data item for OCTETSTR, DISPLAYSTR */ -typedef struct p80211item_pstr14 { +struct p80211item_pstr14 {u32 did;u16 status;u16 len;struct p80211pstr14 data; -} __packed p80211item_pstr14_t; +} __packed;/* message data item for OCTETSTR, DISPLAYSTR */ typedef struct p80211item_pstr32 {
Signature · 1 line
1.9.1
PATCH v2 12/17 staging: wlan-ng: avoid new typedef: p80211item_pstr32_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_pstr32_t
--- drivers/staging/wlan-ng/cfg80211.c | 4 ++-- drivers/staging/wlan-ng/p80211metastruct.h | 8 ++++---- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +2 -2
@@ -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;
drivers/staging/wlan-ng/p80211metastruct.h +4 -4
@@ -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;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -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 {
Signature · 1 line
1.9.1
PATCH v2 13/17 staging: wlan-ng: avoid new typedef: p80211item_pstr255_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_pstr255_t
--- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -302,12 +302,12 @@ struct p80211item_pstr32 { } __packed;/* message data item for OCTETSTR, DISPLAYSTR */ -typedef struct p80211item_pstr255 { +struct p80211item_pstr255 {u32 did;u16 status;u16 len;struct p80211pstr255 data; -} __packed p80211item_pstr255_t; +} __packed;/* message data item for UNK 392, namely mib items */ typedef struct p80211item_unk392 {
Signature · 1 line
1.9.1
PATCH v2 14/17 staging: wlan-ng: avoid new typedef: p80211item_unk392_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_unk392_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 4 ++-- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +2 -2
@@ -51,7 +51,7 @@ struct p80211msg_dot11req_mibget {u32 msgcode;u32 msglen;u8 devname[WLAN_DEVNAMELEN_MAX ]; -p80211item_unk392_t mibattribute; +struct p80211item_unk392 mibattribute;struct p80211item_uint32 resultcode; } __packed;
@@ -59,7 +59,7 @@ struct p80211msg_dot11req_mibset {u32 msgcode;u32 msglen;u8 devname[WLAN_DEVNAMELEN_MAX ]; -p80211item_unk392_t mibattribute; +struct p80211item_unk392 mibattribute;struct p80211item_uint32 resultcode; } __packed;
drivers/staging/wlan-ng/p80211netdev.c +1 -1
@@ -614,7 +614,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; +struct p80211item_unk392 *mibattr;struct p80211item_pstr6 *macaddr;struct p80211item_uint32 *resultcode;int result;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -310,12 +310,12 @@ struct p80211item_pstr255 { } __packed;/* message data item for UNK 392, namely mib items */ -typedef struct p80211item_unk392 { +struct p80211item_unk392 {u32 did;u16 status;u16 len;u8 data[MAXLEN_MIBATTRIBUTE ]; -} __packed p80211item_unk392_t; +} __packed;/* message data item for UNK 1025, namely p2 pdas */ typedef struct p80211item_unk1024 {
Signature · 1 line
1.9.1
PATCH v2 15/17 staging: wlan-ng: avoid new typedef: p80211item_unk1024_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_unk1024_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +1 -1
@@ -227,7 +227,7 @@ struct p80211msg_p2req_readpda {u32 msgcode;u32 msglen;u8 devname[WLAN_DEVNAMELEN_MAX ]; -p80211item_unk1024_t pda; +struct p80211item_unk1024 pda;struct p80211item_uint32 resultcode; } __packed;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -318,12 +318,12 @@ struct p80211item_unk392 { } __packed;/* message data item for UNK 1025, namely p2 pdas */ -typedef struct p80211item_unk1024 { +struct p80211item_unk1024 {u32 did;u16 status;u16 len;u8 data[1024 ]; -} __packed p80211item_unk1024_t; +} __packed;/* message data item for UNK 4096, namely p2 download chunks */ typedef struct p80211item_unk4096 {
Signature · 1 line
1.9.1
PATCH v2 16/17 staging: wlan-ng: avoid new typedef: p80211item_unk4096_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_unk4096_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 4 ++-- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +2 -2
@@ -246,7 +246,7 @@ struct p80211msg_p2req_ramdl_write {u8 devname[WLAN_DEVNAMELEN_MAX ];struct p80211item_uint32 addr;struct p80211item_uint32 len; -p80211item_unk4096_t data; +struct p80211item_unk4096 data;struct p80211item_uint32 resultcode; } __packed;
@@ -264,7 +264,7 @@ struct p80211msg_p2req_flashdl_write {u8 devname[WLAN_DEVNAMELEN_MAX ];struct p80211item_uint32 addr;struct p80211item_uint32 len; -p80211item_unk4096_t data; +struct p80211item_unk4096 data;struct p80211item_uint32 resultcode; } __packed;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -326,12 +326,12 @@ struct p80211item_unk1024 { } __packed;/* message data item for UNK 4096, namely p2 download chunks */ -typedef struct p80211item_unk4096 { +struct p80211item_unk4096 {u32 did;u16 status;u16 len;u8 data[4096 ]; -} __packed p80211item_unk4096_t; +} __packed;struct catlistitem ;
Signature · 1 line
1.9.1
PATCH v2 17/17 staging: wlan-ng: fix block comments style errors
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: Block comments should align the * on each line
--- drivers/staging/wlan-ng/p80211types.h | 135 +++++++++++++++++----------------- 1 file changed, 68 insertions(+), 67 deletions(-)
drivers/staging/wlan-ng/p80211types.h +68 -67
@@ -1,58 +1,59 @@ -/* p80211types.h -* -* Macros, constants, types, and funcs for p80211 data types -* -* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. -* -------------------------------------------------------------------- -* -* linux-wlan -* -* The contents of this file are subject to the Mozilla Public -* License Version 1.1 (the "License"); you may not use this file -* except in compliance with the License. You may obtain a copy of -* the License at http://www.mozilla.org/MPL/ -* -* Software distributed under the License is distributed on an "AS -* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -* implied. See the License for the specific language governing -* rights and limitations under the License. -* -* Alternatively, the contents of this file may be used under the -* terms of the GNU Public License version 2 (the "GPL"), in which -* case the provisions of the GPL are applicable instead of the -* above. If you wish to allow the use of your version of this file -* only under the terms of the GPL and not to allow others to use -* your version of this file under the MPL, indicate your decision -* by deleting the provisions above and replace them with the notice -* and other provisions required by the GPL. If you do not delete -* the provisions above, a recipient may use your version of this -* file under either the MPL or the GPL. -* -* -------------------------------------------------------------------- -* -* Inquiries regarding the linux-wlan Open Source project can be -* made directly to: -* -* AbsoluteValue Systems Inc. -* [email protected] -* http://www.linux-wlan.com -* -* -------------------------------------------------------------------- -* -* Portions of the development of this software were funded by -* Intersil Corporation as part of PRISM(R) chipset product development. -* -* -------------------------------------------------------------------- -* -* This file declares some of the constants and types used in various -* parts of the linux-wlan system. -* -* Notes: -* - Constant values are always in HOST byte order. -* -* All functions and statics declared here are implemented in p80211types.c -* -------------------------------------------------------------------- -*/ +/* +* p80211types.h +* +* Macros, constants, types, and funcs for p80211 data types +* +* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. +* -------------------------------------------------------------------- +* +* linux-wlan +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* Alternatively, the contents of this file may be used under the +* terms of the GNU Public License version 2 (the "GPL"), in which +* case the provisions of the GPL are applicable instead of the +* above. If you wish to allow the use of your version of this file +* only under the terms of the GPL and not to allow others to use +* your version of this file under the MPL, indicate your decision +* by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL. If you do not delete +* the provisions above, a recipient may use your version of this +* file under either the MPL or the GPL. +* +* -------------------------------------------------------------------- +* +* Inquiries regarding the linux-wlan Open Source project can be +* made directly to: +* +* AbsoluteValue Systems Inc. +* [email protected] +* http://www.linux-wlan.com +* +* -------------------------------------------------------------------- +* +* Portions of the development of this software were funded by +* Intersil Corporation as part of PRISM(R) chipset product development. +* +* -------------------------------------------------------------------- +* +* This file declares some of the constants and types used in various +* parts of the linux-wlan system. +* +* Notes: +* - Constant values are always in HOST byte order. +* +* All functions and statics declared here are implemented in p80211types.c +* -------------------------------------------------------------------- +*/ #ifndef _P80211TYPES_H#define _P80211TYPES_H
@@ -123,18 +124,18 @@#define MKENUMNAME (name) p80211enum_ ## name/*---------------------------------------------------------------- -* The following constants and macros are used to construct and -* deconstruct the Data ID codes. The coding is as follows: -* -* ...rwtnnnnnnnniiiiiiggggggssssss s - Section -* g - Group -* i - Item -* n - Index -* t - Table flag -* w - Write flag -* r - Read flag -* . - Unused -*/ +* The following constants and macros are used to construct and +* deconstruct the Data ID codes. The coding is as follows: +* +* ...rwtnnnnnnnniiiiiiggggggssssss s - Section +* g - Group +* i - Item +* n - Index +* t - Table flag +* w - Write flag +* r - Read flag +* . - Unused +*/ #define P80211DID_LSB_SECTION (0)#define P80211DID_LSB_GROUP (6)
Signature · 1 line
1.9.1
Re: [PATCH v2 17/17] staging: wlan-ng: fix block comments style errors
We should consult a lawyer before doing such dramatic changes to the license.
drivers/staging/wlan-ng/p80211types.h line 19
Quoted 9 lines · Sergio Paracuellos
drivers/staging/wlan-ng/p80211types.h +4
-4-* Software distributed under the License is distributed on an "AS -* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -* implied. See the License for the specific language governing -* rights and limitations under the License. +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License.
Cheers, CC
PATCH 5/20 staging: wlan-ng: avoid new typedef: p80211pstr255_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr255_t
--- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -225,10 +225,10 @@ struct p80211pstrd { } __packed;/* Maximum pascal string */ -typedef struct p80211pstr255 { +struct p80211pstr255 {u8 len;u8 data[MAXLEN_PSTR255 ]; -} __packed p80211pstr255_t; +} __packed;/* pascal string for macaddress and bssid */ typedef struct p80211pstr6 {
@@ -306,7 +306,7 @@ struct p80211pstrd {u32 did;u16 status;u16 len; -p80211pstr255_t data; +struct p80211pstr255 data; }__packed p80211item_pstr255_t;/* message data item for UNK 392, namely mib items */
Signature · 1 line
1.9.1
PATCH 6/20 staging: wlan-ng: avoid new typedef: p80211pstr6_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr6_t
--- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -231,10 +231,10 @@ struct p80211pstr255 { } __packed;/* pascal string for macaddress and bssid */ -typedef struct p80211pstr6 { +struct p80211pstr6 {u8 len;u8 data[MAXLEN_PSTR6 ]; -} __packed p80211pstr6_t; +} __packed;/* pascal string for channel list */ typedef struct p80211pstr14 {
@@ -282,7 +282,7 @@ struct p80211pstr255 {u32 did;u16 status;u16 len; -p80211pstr6_t data; +struct p80211pstr6 data; }__packed p80211item_pstr6_t;/* message data item for OCTETSTR, DISPLAYSTR */
Signature · 1 line
1.9.1
PATCH 7/20 staging: wlan-ng: avoid new typedef: p80211pstr14_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr14_t
--- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -237,10 +237,10 @@ struct p80211pstr6 { } __packed;/* pascal string for channel list */ -typedef struct p80211pstr14 { +struct p80211pstr14 {u8 len;u8 data[MAXLEN_PSTR14 ]; -} __packed p80211pstr14_t; +} __packed;/* pascal string for ssid */ typedef struct p80211pstr32 {
@@ -290,7 +290,7 @@ struct p80211pstr6 {u32 did;u16 status;u16 len; -p80211pstr14_t data; +struct p80211pstr14 data; }__packed p80211item_pstr14_t;/* message data item for OCTETSTR, DISPLAYSTR */
Signature · 1 line
1.9.1
PATCH 8/20 staging: wlan-ng: avoid new typedef: p80211pstr32_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211pstr32_t
--- drivers/staging/wlan-ng/p80211netdev.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/wlan-ng/p80211netdev.h +1 -1
@@ -191,7 +191,7 @@ struct wlandevice {/* 802.11 State */ u8 bssid[WLAN_BSSID_LEN ]; -p80211pstr32_t ssid; +struct p80211pstr32 ssid;u32 macmode;int linkstatus;
drivers/staging/wlan-ng/p80211types.h +3 -3
@@ -243,10 +243,10 @@ struct p80211pstr14 { } __packed;/* pascal string for ssid */ -typedef struct p80211pstr32 { +struct p80211pstr32 {u8 len;u8 data[MAXLEN_PSTR32 ]; -} __packed p80211pstr32_t; +} __packed;/* MAC address array */ typedef struct p80211macarray {
@@ -298,7 +298,7 @@ struct p80211pstr14 {u32 did;u16 status;u16 len; -p80211pstr32_t data; +struct p80211pstr32 data; }__packed p80211item_pstr32_t;/* message data item for OCTETSTR, DISPLAYSTR */
Signature · 1 line
1.9.1
PATCH 9/20 staging: wlan-ng: avoid new typedef: p80211macarray_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211macarray_t
--- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -249,10 +249,10 @@ struct p80211pstr32 { } __packed;/* MAC address array */ -typedef struct p80211macarray { +struct p80211macarray {u32 cnt;u8 data[1 ][MAXLEN_PSTR6 ]; -} __packed p80211macarray_t; +} __packed;/* prototype template */ typedef struct p80211item {
Signature · 1 line
1.9.1
PATCH 10/20 staging: wlan-ng: avoid new typedef: p80211item_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_t
--- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -255,11 +255,11 @@ struct p80211macarray { } __packed;/* prototype template */ -typedef struct p80211item { +struct p80211item {u32 did;u16 status;u16 len; -} __packed p80211item_t; +} __packed;/* prototype template w/ data item */ typedef struct p80211itemd {
Signature · 1 line
1.9.1
PATCH 11/20 staging: wlan-ng: avoid new typedef: p80211itemd_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211itemd_t
--- drivers/staging/wlan-ng/p80211req.c | 3 ++- drivers/staging/wlan-ng/p80211types.h | 4 ++-- drivers/staging/wlan-ng/prism2fw.c | 4 ++-- drivers/staging/wlan-ng/prism2mib.c | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-)
drivers/staging/wlan-ng/p80211req.c +2 -1
@@ -195,7 +195,8 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev, struct p80211msg_dot11req_mibget *mib_msg, int isget) { -p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data; +struct p80211itemd *mibitem = (struct p80211itemd *) + mib_msg->mibattribute.data;struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data;u8 *key = mibitem->data +sizeof (struct p80211pstrd );
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -262,12 +262,12 @@ struct p80211item { } __packed;/* prototype template w/ data item */ -typedef struct p80211itemd { +struct p80211itemd {u32 did;u16 status;u16 len;u8 data[0 ]; -} __packed p80211itemd_t; +} __packed;/* message data item for int, BOUNDEDINT, ENUMINT */ typedef struct p80211item_uint32 {
drivers/staging/wlan-ng/prism2fw.c +2 -2
@@ -243,7 +243,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, {signed int result =0 ;struct p80211msg_dot11req_mibget getmsg; -p80211itemd_t *item; +struct p80211itemd *item;u32 *data;/* Initialize the data structures */
@@ -293,7 +293,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, getmsg.resultcode.did = DIDmsg_dot11req_mibget_resultcode; getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value; - item = (p80211itemd_t *) getmsg.mibattribute.data; + item = (struct p80211itemd *)getmsg.mibattribute.data; item->did = DIDmib_p2_p2NIC_p2PRISupRange; item->status = P80211ENUM_msgitem_status_no_value;
drivers/staging/wlan-ng/prism2mib.c +2 -2
@@ -266,7 +266,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)u16 which;struct p80211msg_dot11req_mibset *msg = msgp; -p80211itemd_t *mibitem; +struct p80211itemd *mibitem; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.data = P80211ENUM_resultcode_success;
@@ -284,7 +284,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)** MIB table. */ - mibitem = (p80211itemd_t *) msg->mibattribute.data; + mibitem = (struct p80211itemd *)msg->mibattribute.data;for (mib = mibtab; mib->did !=0 ; mib++)if (mib->did == mibitem->did && (mib->flag & which))
Signature · 1 line
1.9.1
PATCH 12/20 staging: wlan-ng: avoid new typedef: p80211item_uint32_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_uint32_t
--- drivers/staging/wlan-ng/cfg80211.c | 8 +- drivers/staging/wlan-ng/p80211metastruct.h | 224 ++++++++++++++--------------- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 +- drivers/staging/wlan-ng/prism2sta.c | 2 +- 5 files changed, 120 insertions(+), 120 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +4 -4
@@ -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 *)&msg.mibattribute.data; +struct p80211item_uint32 *mibitem = + (struct p80211item_uint32 *)&msg.mibattribute.data; 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 *)&msg.mibattribute.data; + mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data; msg.msgcode = DIDmsg_dot11req_mibget; mibitem->did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
drivers/staging/wlan-ng/p80211metastruct.h +112 -112
326 lines not on this page · raw message
drivers/staging/wlan-ng/p80211netdev.c +1 -1
@@ -616,7 +616,7 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)struct p80211msg_dot11req_mibset dot11req;p80211item_unk392_t *mibattr;p80211item_pstr6_t *macaddr; -p80211item_uint32_t *resultcode; +struct p80211item_uint32 *resultcode;int result;/* If we're running, we don't allow MAC address changes */
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -270,12 +270,12 @@ struct p80211itemd { } __packed;/* message data item for int, BOUNDEDINT, ENUMINT */ -typedef struct p80211item_uint32 { +struct p80211item_uint32 {u32 did;u16 status;u16 len;u32 data; -} __packed p80211item_uint32_t; +} __packed;/* message data item for OCTETSTR, DISPLAYSTR */ typedef struct p80211item_pstr6 {
drivers/staging/wlan-ng/prism2sta.c +1 -1
@@ -1917,7 +1917,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)struct wlandevice *wlandev = hw->wlandev;hfa384x_bytestr32_t ssid;struct p80211msg_dot11req_mibget msg; -p80211item_uint32_t *mibitem = (p80211item_uint32_t *) +struct p80211item_uint32 *mibitem = (struct p80211item_uint32 *) &msg.mibattribute.data;int result =0 ;
Signature · 1 line
1.9.1
PATCH 13/20 staging: wlan-ng: avoid new typedef: p80211item_pstr6_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_pstr6_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 4 ++-- drivers/staging/wlan-ng/p80211netdev.c | 4 ++-- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +2 -2
@@ -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 ];
drivers/staging/wlan-ng/p80211netdev.c +2 -2
@@ -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 */
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -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 {
Signature · 1 line
1.9.1
PATCH 14/20 staging: wlan-ng: avoid new typedef: p80211item_pstr14_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_pstr14_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +1 -1
@@ -74,7 +74,7 @@ struct p80211msg_dot11req_scan {u8 pad_1D[3 ];struct p80211item_uint32 scantype;struct p80211item_uint32 probedelay; -p80211item_pstr14_t channellist; +struct p80211item_pstr14 channellist;u8 pad_2C[1 ];struct p80211item_uint32 minchanneltime;struct p80211item_uint32 maxchanneltime;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -286,12 +286,12 @@ struct p80211item_pstr6 { } __packed;/* message data item for OCTETSTR, DISPLAYSTR */ -typedef struct p80211item_pstr14 { +struct p80211item_pstr14 {u32 did;u16 status;u16 len;struct p80211pstr14 data; -} __packed p80211item_pstr14_t; +} __packed;/* message data item for OCTETSTR, DISPLAYSTR */ typedef struct p80211item_pstr32 {
Signature · 1 line
1.9.1
PATCH 15/20 staging: wlan-ng: avoid new typedef: p80211item_pstr32_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_pstr32_t
--- drivers/staging/wlan-ng/cfg80211.c | 4 ++-- drivers/staging/wlan-ng/p80211metastruct.h | 8 ++++---- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +2 -2
@@ -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;
drivers/staging/wlan-ng/p80211metastruct.h +4 -4
@@ -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;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -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 {
Signature · 1 line
1.9.1
PATCH 16/20 staging: wlan-ng: avoid new typedef: p80211item_pstr255_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_pstr255_t
--- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -302,12 +302,12 @@ struct p80211item_pstr32 { } __packed;/* message data item for OCTETSTR, DISPLAYSTR */ -typedef struct p80211item_pstr255 { +struct p80211item_pstr255 {u32 did;u16 status;u16 len;struct p80211pstr255 data; -} __packed p80211item_pstr255_t; +} __packed;/* message data item for UNK 392, namely mib items */ typedef struct p80211item_unk392 {
Signature · 1 line
1.9.1
PATCH 17/20 staging: wlan-ng: avoid new typedef: p80211item_unk392_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_unk392_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 4 ++-- drivers/staging/wlan-ng/p80211netdev.c | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +2 -2
@@ -51,7 +51,7 @@ struct p80211msg_dot11req_mibget {u32 msgcode;u32 msglen;u8 devname[WLAN_DEVNAMELEN_MAX ]; -p80211item_unk392_t mibattribute; +struct p80211item_unk392 mibattribute;struct p80211item_uint32 resultcode; } __packed;
@@ -59,7 +59,7 @@ struct p80211msg_dot11req_mibset {u32 msgcode;u32 msglen;u8 devname[WLAN_DEVNAMELEN_MAX ]; -p80211item_unk392_t mibattribute; +struct p80211item_unk392 mibattribute;struct p80211item_uint32 resultcode; } __packed;
drivers/staging/wlan-ng/p80211netdev.c +1 -1
@@ -614,7 +614,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; +struct p80211item_unk392 *mibattr;struct p80211item_pstr6 *macaddr;struct p80211item_uint32 *resultcode;int result;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -310,12 +310,12 @@ struct p80211item_pstr255 { } __packed;/* message data item for UNK 392, namely mib items */ -typedef struct p80211item_unk392 { +struct p80211item_unk392 {u32 did;u16 status;u16 len;u8 data[MAXLEN_MIBATTRIBUTE ]; -} __packed p80211item_unk392_t; +} __packed;/* message data item for UNK 1025, namely p2 pdas */ typedef struct p80211item_unk1024 {
Signature · 1 line
1.9.1
PATCH 18/20 staging: wlan-ng: avoid new typedef: p80211item_unk1024_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_unk1024_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +1 -1
@@ -227,7 +227,7 @@ struct p80211msg_p2req_readpda {u32 msgcode;u32 msglen;u8 devname[WLAN_DEVNAMELEN_MAX ]; -p80211item_unk1024_t pda; +struct p80211item_unk1024 pda;struct p80211item_uint32 resultcode; } __packed;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -318,12 +318,12 @@ struct p80211item_unk392 { } __packed;/* message data item for UNK 1025, namely p2 pdas */ -typedef struct p80211item_unk1024 { +struct p80211item_unk1024 {u32 did;u16 status;u16 len;u8 data[1024 ]; -} __packed p80211item_unk1024_t; +} __packed;/* message data item for UNK 4096, namely p2 download chunks */ typedef struct p80211item_unk4096 {
Signature · 1 line
1.9.1
PATCH 19/20 staging: wlan-ng: avoid new typedef: p80211item_unk4096_t
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
It applies for typedef p80211item_unk4096_t
--- drivers/staging/wlan-ng/p80211metastruct.h | 4 ++-- drivers/staging/wlan-ng/p80211types.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/wlan-ng/p80211metastruct.h +2 -2
@@ -246,7 +246,7 @@ struct p80211msg_p2req_ramdl_write {u8 devname[WLAN_DEVNAMELEN_MAX ];struct p80211item_uint32 addr;struct p80211item_uint32 len; -p80211item_unk4096_t data; +struct p80211item_unk4096 data;struct p80211item_uint32 resultcode; } __packed;
@@ -264,7 +264,7 @@ struct p80211msg_p2req_flashdl_write {u8 devname[WLAN_DEVNAMELEN_MAX ];struct p80211item_uint32 addr;struct p80211item_uint32 len; -p80211item_unk4096_t data; +struct p80211item_unk4096 data;struct p80211item_uint32 resultcode; } __packed;
drivers/staging/wlan-ng/p80211types.h +2 -2
@@ -326,12 +326,12 @@ struct p80211item_unk1024 { } __packed;/* message data item for UNK 4096, namely p2 download chunks */ -typedef struct p80211item_unk4096 { +struct p80211item_unk4096 {u32 did;u16 status;u16 len;u8 data[4096 ]; -} __packed p80211item_unk4096_t; +} __packed;struct catlistitem ;
Signature · 1 line
1.9.1
PATCH 20/20 staging: wlan-ng: fix block comments style errors
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: Block comments should align the * on each line
--- drivers/staging/wlan-ng/p80211types.h | 135 +++++++++++++++++----------------- 1 file changed, 68 insertions(+), 67 deletions(-)
drivers/staging/wlan-ng/p80211types.h +68 -67
@@ -1,58 +1,59 @@ -/* p80211types.h -* -* Macros, constants, types, and funcs for p80211 data types -* -* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. -* -------------------------------------------------------------------- -* -* linux-wlan -* -* The contents of this file are subject to the Mozilla Public -* License Version 1.1 (the "License"); you may not use this file -* except in compliance with the License. You may obtain a copy of -* the License at http://www.mozilla.org/MPL/ -* -* Software distributed under the License is distributed on an "AS -* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -* implied. See the License for the specific language governing -* rights and limitations under the License. -* -* Alternatively, the contents of this file may be used under the -* terms of the GNU Public License version 2 (the "GPL"), in which -* case the provisions of the GPL are applicable instead of the -* above. If you wish to allow the use of your version of this file -* only under the terms of the GPL and not to allow others to use -* your version of this file under the MPL, indicate your decision -* by deleting the provisions above and replace them with the notice -* and other provisions required by the GPL. If you do not delete -* the provisions above, a recipient may use your version of this -* file under either the MPL or the GPL. -* -* -------------------------------------------------------------------- -* -* Inquiries regarding the linux-wlan Open Source project can be -* made directly to: -* -* AbsoluteValue Systems Inc. -* [email protected] -* http://www.linux-wlan.com -* -* -------------------------------------------------------------------- -* -* Portions of the development of this software were funded by -* Intersil Corporation as part of PRISM(R) chipset product development. -* -* -------------------------------------------------------------------- -* -* This file declares some of the constants and types used in various -* parts of the linux-wlan system. -* -* Notes: -* - Constant values are always in HOST byte order. -* -* All functions and statics declared here are implemented in p80211types.c -* -------------------------------------------------------------------- -*/ +/* +* p80211types.h +* +* Macros, constants, types, and funcs for p80211 data types +* +* Copyright (C) 1999 AbsoluteValue Systems, Inc. All Rights Reserved. +* -------------------------------------------------------------------- +* +* linux-wlan +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* Alternatively, the contents of this file may be used under the +* terms of the GNU Public License version 2 (the "GPL"), in which +* case the provisions of the GPL are applicable instead of the +* above. If you wish to allow the use of your version of this file +* only under the terms of the GPL and not to allow others to use +* your version of this file under the MPL, indicate your decision +* by deleting the provisions above and replace them with the notice +* and other provisions required by the GPL. If you do not delete +* the provisions above, a recipient may use your version of this +* file under either the MPL or the GPL. +* +* -------------------------------------------------------------------- +* +* Inquiries regarding the linux-wlan Open Source project can be +* made directly to: +* +* AbsoluteValue Systems Inc. +* [email protected] +* http://www.linux-wlan.com +* +* -------------------------------------------------------------------- +* +* Portions of the development of this software were funded by +* Intersil Corporation as part of PRISM(R) chipset product development. +* +* -------------------------------------------------------------------- +* +* This file declares some of the constants and types used in various +* parts of the linux-wlan system. +* +* Notes: +* - Constant values are always in HOST byte order. +* +* All functions and statics declared here are implemented in p80211types.c +* -------------------------------------------------------------------- +*/ #ifndef _P80211TYPES_H#define _P80211TYPES_H
@@ -123,18 +124,18 @@#define MKENUMNAME (name) p80211enum_ ## name/*---------------------------------------------------------------- -* The following constants and macros are used to construct and -* deconstruct the Data ID codes. The coding is as follows: -* -* ...rwtnnnnnnnniiiiiiggggggssssss s - Section -* g - Group -* i - Item -* n - Index -* t - Table flag -* w - Write flag -* r - Read flag -* . - Unused -*/ +* The following constants and macros are used to construct and +* deconstruct the Data ID codes. The coding is as follows: +* +* ...rwtnnnnnnnniiiiiiggggggssssss s - Section +* g - Group +* i - Item +* n - Index +* t - Table flag +* w - Write flag +* r - Read flag +* . - Unused +*/ #define P80211DID_LSB_SECTION (0)#define P80211DID_LSB_GROUP (6)
Signature · 1 line
1.9.1
PATCH 1/1 staging: wlan-ng: avoid to introduce new typedefs
In reply to Sergio ParacuellosThis patch fixes the following checkpatch.pl warning in p80211types.h:
WARNING: do not add new typedefs
--- 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(-)
drivers/staging/wlan-ng/cfg80211.c +6 -6
@@ -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 *)&msg.mibattribute.data; +struct p80211item_uint32 *mibitem = + (struct p80211item_uint32 *)&msg.mibattribute.data; 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 *)&msg.mibattribute.data; +struct p80211item_pstr32 *mibitem = + (struct p80211item_pstr32 *)&msg.mibattribute.data; 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 *)&msg.mibattribute.data; + mibitem = (struct p80211item_uint32 *)&msg.mibattribute.data; msg.msgcode = DIDmsg_dot11req_mibget; mibitem->did = DIDmib_dot11phy_dot11PhyTxPowerTable_dot11CurrentTxPowerLevel;
drivers/staging/wlan-ng/p80211metastruct.h +124 -124
345 lines not on this page · raw message
drivers/staging/wlan-ng/p80211netdev.c +4 -4
@@ -614,9 +614,9 @@ 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; -p80211item_uint32_t *resultcode; +struct p80211item_unk392 *mibattr; +struct p80211item_pstr6 *macaddr; +struct p80211item_uint32 *resultcode;int result;/* If we're running, we don't allow MAC address changes */
@@ -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 */
drivers/staging/wlan-ng/p80211netdev.h +1 -1
@@ -191,7 +191,7 @@ struct wlandevice {/* 802.11 State */ u8 bssid[WLAN_BSSID_LEN ]; -p80211pstr32_t ssid; +struct p80211pstr32 ssid;u32 macmode;int linkstatus;
drivers/staging/wlan-ng/p80211req.c +4 -3
@@ -195,9 +195,10 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev, struct p80211msg_dot11req_mibget *mib_msg, int isget) { -p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data; -p80211pstrd_t *pstr = (p80211pstrd_t *) mibitem->data; -u8 *key = mibitem->data +sizeof (p80211pstrd_t); +struct p80211itemd *mibitem = (struct p80211itemd *) + mib_msg->mibattribute.data; +struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data; +u8 *key = mibitem->data +sizeof (struct p80211pstrd );switch (mibitem->did) {case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key (1 ):
drivers/staging/wlan-ng/p80211types.h +63 -63
226 lines not on this page · raw message
drivers/staging/wlan-ng/prism2fw.c +2 -2
@@ -243,7 +243,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, {signed int result =0 ;struct p80211msg_dot11req_mibget getmsg; -p80211itemd_t *item; +struct p80211itemd *item;u32 *data;/* Initialize the data structures */
@@ -293,7 +293,7 @@ static int prism2_fwapply(const struct ihex_binrec *rfptr, getmsg.resultcode.did = DIDmsg_dot11req_mibget_resultcode; getmsg.resultcode.status = P80211ENUM_msgitem_status_no_value; - item = (p80211itemd_t *) getmsg.mibattribute.data; + item = (struct p80211itemd *)getmsg.mibattribute.data; item->did = DIDmib_p2_p2NIC_p2PRISupRange; item->status = P80211ENUM_msgitem_status_no_value;
drivers/staging/wlan-ng/prism2mgmt.c +4 -4
@@ -531,7 +531,7 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)hfa384x_t *hw = wlandev->priv;struct p80211msg_dot11req_start *msg = msgp; -p80211pstrd_t *pstr; +struct p80211pstrd *pstr;u8 bytebuf[80 ];struct hfa384x_bytestr *p2bytestr = (struct hfa384x_bytestr *) bytebuf;u16 word;
@@ -558,7 +558,7 @@ int prism2mgmt_start(struct wlandevice *wlandev, void *msgp)/*** STATION ***/ /* Set the REQUIRED config items */ /* SSID */ - pstr = (p80211pstrd_t *) &(msg->ssid.data); + pstr = (struct p80211pstrd *)&msg->ssid.data;prism2mgmt_pstr2bytestr (p2bytestr, pstr); result =hfa384x_drvr_setconfig (hw, HFA384x_RID_CNFOWNSSID, bytebuf, HFA384x_RID_CNFOWNSSID_LEN);
@@ -1026,7 +1026,7 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)u16 reg;u16 port_type;struct p80211msg_lnxreq_autojoin *msg = msgp; -p80211pstrd_t *pstr; +struct p80211pstrd *pstr;u8 bytebuf[256 ];struct hfa384x_bytestr *p2bytestr = (struct hfa384x_bytestr *) bytebuf;
@@ -1052,7 +1052,7 @@ int prism2mgmt_autojoin(struct wlandevice *wlandev, void *msgp)/* Set the ssid */ memset (bytebuf,0 ,256 ); - pstr = (p80211pstrd_t *) &(msg->ssid.data); + pstr = (struct p80211pstrd *)&msg->ssid.data;prism2mgmt_pstr2bytestr (p2bytestr, pstr); result = hfa384x_drvr_setconfig(hw, HFA384x_RID_CNFDESIREDSSID, bytebuf,
drivers/staging/wlan-ng/prism2mgmt.h +5 -5
@@ -87,18 +87,18 @@* Prism2 data types ---------------------------------------------------------------*/ /* byte area conversion functions*/ -void prism2mgmt_bytearea2pstr (u8 *bytearea,p80211pstrd_t *pstr,int len); +void prism2mgmt_bytearea2pstr (u8 *bytearea,struct p80211pstrd *pstr,int len);/* byte string conversion functions*/ void prism2mgmt_pstr2bytestr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr); +struct p80211pstrd *pstr);void prism2mgmt_bytestr2pstr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr); +struct p80211pstrd *pstr);/* functions to convert Group Addresses */ -void prism2mgmt_get_grpaddr (u32 did,p80211pstrd_t *pstr,hfa384x_t *priv); +void prism2mgmt_get_grpaddr (u32 did,struct p80211pstrd *pstr,hfa384x_t *priv);int prism2mgmt_set_grpaddr (u32 did, -u8 *prism2buf,p80211pstrd_t *pstr, +u8 *prism2buf,struct p80211pstrd *pstr,hfa384x_t *priv);int prism2mgmt_get_grpaddr_index (u32 did);
drivers/staging/wlan-ng/prism2mib.c +8 -8
@@ -266,7 +266,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)u16 which;struct p80211msg_dot11req_mibset *msg = msgp; -p80211itemd_t *mibitem; +struct p80211itemd *mibitem; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.data = P80211ENUM_resultcode_success;
@@ -284,7 +284,7 @@ int prism2mgmt_mibset_mibget(struct wlandevice *wlandev, void *msgp)** MIB table. */ - mibitem = (p80211itemd_t *) msg->mibattribute.data; + mibitem = (struct p80211itemd *)msg->mibattribute.data;for (mib = mibtab; mib->did !=0 ; mib++)if (mib->did == mibitem->did && (mib->flag & which))
@@ -379,7 +379,7 @@ static int prism2mib_bytearea2pstr(struct mibrec *mib, void *data) {int result; -p80211pstrd_t *pstr = data; +struct p80211pstrd *pstr = data;u8 bytebuf[MIB_TMP_MAXLEN ];if (isget) {
@@ -533,7 +533,7 @@ static int prism2mib_wepdefaultkey(struct mibrec *mib, void *data) {int result; -p80211pstrd_t *pstr = data; +struct p80211pstrd *pstr = data;u8 bytebuf[MIB_TMP_MAXLEN ];u16 len;
@@ -705,7 +705,7 @@ static int prism2mib_priv(struct mibrec *mib,hfa384x_t *hw, struct p80211msg_dot11req_mibset *msg, void *data) { - p80211pstrd_t *pstr = data; + struct p80211pstrd *pstr = data;switch (mib->did) {case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
@@ -752,7 +752,7 @@ static int prism2mib_priv(struct mibrec *mib,*/ void prism2mgmt_pstr2bytestr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr) +struct p80211pstrd *pstr) { bytestr->len =cpu_to_le16 ((u16) (pstr->len));memcpy (bytestr->data, pstr->data, pstr->len);
@@ -774,7 +774,7 @@ void prism2mgmt_pstr2bytestr(struct hfa384x_bytestr *bytestr,*/ void prism2mgmt_bytestr2pstr (struct hfa384x_bytestr *bytestr, -p80211pstrd_t *pstr) +struct p80211pstrd *pstr) { pstr->len = (u8) (le16_to_cpu ((u16) (bytestr->len)));memcpy (pstr->data, bytestr->data, pstr->len);
@@ -795,7 +795,7 @@ void prism2mgmt_bytestr2pstr(struct hfa384x_bytestr *bytestr,* */ -void prism2mgmt_bytearea2pstr (u8 *bytearea,p80211pstrd_t *pstr,int len) +void prism2mgmt_bytearea2pstr (u8 *bytearea,struct p80211pstrd *pstr,int len) { pstr->len = (u8 ) len;memcpy (pstr->data, bytearea, len);
drivers/staging/wlan-ng/prism2sta.c +4 -4
@@ -1257,7 +1257,7 @@ void prism2sta_processing_defer(struct work_struct *data) }prism2mgmt_bytestr2pstr ( (struct hfa384x_bytestr *) &ssid, - (p80211pstrd_t *) &wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid);/* Collect the port status */ result = hfa384x_drvr_getconfig16(hw,
@@ -1338,7 +1338,7 @@ void prism2sta_processing_defer(struct work_struct *data)return ; }prism2mgmt_bytestr2pstr ((struct hfa384x_bytestr *) &ssid, - (p80211pstrd_t *) &wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid); hw->link_status = HFA384x_LINK_CONNECTED;netif_carrier_on (wlandev->netdev);
@@ -1917,7 +1917,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)struct wlandevice *wlandev = hw->wlandev;hfa384x_bytestr32_t ssid;struct p80211msg_dot11req_mibget msg; -p80211item_uint32_t *mibitem = (p80211item_uint32_t *) +struct p80211item_uint32 *mibitem = (struct p80211item_uint32 *) &msg.mibattribute.data;int result =0 ;
@@ -1994,7 +1994,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)return ; }prism2mgmt_bytestr2pstr ((struct hfa384x_bytestr *) &ssid, - (p80211pstrd_t *) &wlandev->ssid); + (struct p80211pstrd *)&wlandev->ssid);/* Reschedule timer */ mod_timer (&hw->commsqual_timer, jiffies +HZ );
Signature · 1 line
1.9.1
Greg KH
maintainerRe: [PATCH] staging: wlan-ng: avoid to introduce new typedefs
Quoted 5 lines · Sergio Paracuellos
This patch fixes the following checkpatch.pl warning in
p80211types.h:
WARNING: do not add new typedefsSigned-off-by Sergio Paracuellos <[email protected]>---
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
Drop it, please. It seems I wrongly included the original patch too.
Sorry for inconvenience.
Thanks,
Sergio Paracuellos
Quoted 14 lines · Greg KH
Quoted 5 lines · Sergio Paracuellos
This patch fixes the following checkpatch.pl warning in
p80211types.h:
WARNING: do not add new typedefsSigned-off-by Sergio Paracuellos <[email protected]>---
Was this patch part of this series? It didn't have a number, so I'm dropping it...
thanks,
greg k-h