Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fd1e3fc authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

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

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c52425a

drivers/staging/wlan-ng/p80211req.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);