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

Commit b6bb56e6 authored by Edgardo Hames's avatar Edgardo Hames Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: fix checkpatch issues in headers. 



This patch fix errors and warnings reported by checkpatch
in p80211meta.h and p80211metstruct.h.

Signed-off-by: default avatarEdgardo Hames <ehames@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e5bdbb90

drivers/staging/wlan-ng/cfg80211.c

+9 −9
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int prism2_result2err(int prism2_result) 


static int prism2_domibset_uint32(wlandevice_t *wlandev, u32 did, u32 data)

{

	p80211msg_dot11req_mibset_t msg;

	struct p80211msg_dot11req_mibset msg;

	p80211item_uint32_t *mibitem = (p80211item_uint32_t *) &msg.mibattribute.data;



	msg.msgcode = DIDmsg_dot11req_mibset;
@@ -85,7 +85,7 @@ static int prism2_domibset_uint32(wlandevice_t *wlandev, u32 did, u32 data) 
static int prism2_domibset_pstr32(wlandevice_t *wlandev,

				  u32 did, u8 len, u8 *data)

{

	p80211msg_dot11req_mibset_t msg;

	struct p80211msg_dot11req_mibset msg;

	p80211item_pstr32_t *mibitem = (p80211item_pstr32_t *) &msg.mibattribute.data;



	msg.msgcode = DIDmsg_dot11req_mibset;
@@ -294,7 +294,7 @@ int prism2_get_station(struct wiphy *wiphy, struct net_device *dev, 
		       u8 *mac, struct station_info *sinfo)

{

	wlandevice_t *wlandev = dev->ml_priv;

	p80211msg_lnxreq_commsquality_t quality;

	struct p80211msg_lnxreq_commsquality quality;

	int result;



	memset(sinfo, 0, sizeof(*sinfo));
@@ -329,8 +329,8 @@ int prism2_scan(struct wiphy *wiphy, struct net_device *dev, 
{

	struct prism2_wiphy_private *priv = wiphy_priv(wiphy);

	wlandevice_t *wlandev = dev->ml_priv;

	p80211msg_dot11req_scan_t msg1;

	p80211msg_dot11req_scan_results_t msg2;

	struct p80211msg_dot11req_scan msg1;

	struct p80211msg_dot11req_scan_results msg2;

	int result;

	int err = 0;

	int numbss = 0;
@@ -351,7 +351,7 @@ int prism2_scan(struct wiphy *wiphy, struct net_device *dev, 


	priv->scan_request = request;



	memset(&msg1, 0x00, sizeof(p80211msg_dot11req_scan_t));

	memset(&msg1, 0x00, sizeof(struct p80211msg_dot11req_scan));

	msg1.msgcode = DIDmsg_dot11req_scan;

	msg1.bsstype.data = P80211ENUM_bsstype_any;
@@ -468,7 +468,7 @@ int prism2_connect(struct wiphy *wiphy, struct net_device *dev, 
{

	wlandevice_t *wlandev = dev->ml_priv;

	struct ieee80211_channel *channel = sme->channel;

	p80211msg_lnxreq_autojoin_t msg_join;

	struct p80211msg_lnxreq_autojoin msg_join;

	u32 did;

	int length = sme->ssid_len;

	int chan = -1;
@@ -589,7 +589,7 @@ int prism2_disconnect(struct wiphy *wiphy, struct net_device *dev, 
		      u16 reason_code)

{

	wlandevice_t *wlandev = dev->ml_priv;

	p80211msg_lnxreq_autojoin_t msg_join;

	struct p80211msg_lnxreq_autojoin msg_join;

	int result;

	int err = 0;
@@ -652,7 +652,7 @@ int prism2_get_tx_power(struct wiphy *wiphy, int *dbm) 
{

	struct prism2_wiphy_private *priv = wiphy_priv(wiphy);

	wlandevice_t *wlandev = priv->wlandev;

	p80211msg_dot11req_mibget_t msg;

	struct p80211msg_dot11req_mibget msg;

	p80211item_uint32_t *mibitem = (p80211item_uint32_t *) &msg.mibattribute.data;

	int result;

	int err = 0;

drivers/staging/wlan-ng/p80211meta.h

+8 −8
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
/* representation of category list metadata, group list metadata, */

/* and data item metadata for both Mib and Messages. */



typedef struct p80211meta {

struct p80211meta {

	char *name;		/* data item name */

	u32 did;		/* partial did */

	u32 flags;		/* set of various flag bits */
@@ -75,16 +75,16 @@ typedef struct p80211meta { 
	p80211_totext_t totextptr;	/* ptr to totext conversion function */

	p80211_fromtext_t fromtextptr;	/* ptr to totext conversion function */

	p80211_valid_t validfunptr;	/* ptr to totext conversion function */

} p80211meta_t;

};



typedef struct grplistitem {

struct grplistitem {

	char *name;

	p80211meta_t *itemlist;

} grplistitem_t;

	struct p80211meta *itemlist;

};



typedef struct catlistitem {

struct catlistitem {

	char *name;

	grplistitem_t *grplist;

} catlistitem_t;

	struct grplistitem *grplist;

};



#endif /* _P80211META_H */

drivers/staging/wlan-ng/p80211metastruct.h

+30 −30
Original line number Diff line number Diff line
@@ -47,23 +47,23 @@ 
#ifndef _P80211MKMETASTRUCT_H

#define _P80211MKMETASTRUCT_H



typedef struct p80211msg_dot11req_mibget {

struct p80211msg_dot11req_mibget {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];

	p80211item_unk392_t mibattribute;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_dot11req_mibget_t;

} __attribute__ ((packed));



typedef struct p80211msg_dot11req_mibset {

struct p80211msg_dot11req_mibset {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];

	p80211item_unk392_t mibattribute;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_dot11req_mibset_t;

} __attribute__ ((packed));



typedef struct p80211msg_dot11req_scan {

struct p80211msg_dot11req_scan {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];
@@ -81,9 +81,9 @@ typedef struct p80211msg_dot11req_scan { 
	p80211item_uint32_t resultcode;

	p80211item_uint32_t numbss;

	p80211item_uint32_t append;

} __attribute__ ((packed)) p80211msg_dot11req_scan_t;

} __attribute__ ((packed));



typedef struct p80211msg_dot11req_scan_results {

struct p80211msg_dot11req_scan_results {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];
@@ -130,9 +130,9 @@ typedef struct p80211msg_dot11req_scan_results { 
	p80211item_uint32_t supprate6;

	p80211item_uint32_t supprate7;

	p80211item_uint32_t supprate8;

} __attribute__ ((packed)) p80211msg_dot11req_scan_results_t;

} __attribute__ ((packed));



typedef struct p80211msg_dot11req_start {

struct p80211msg_dot11req_start {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];
@@ -168,17 +168,17 @@ typedef struct p80211msg_dot11req_start { 
	p80211item_uint32_t operationalrate7;

	p80211item_uint32_t operationalrate8;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_dot11req_start_t;

} __attribute__ ((packed));



typedef struct p80211msg_lnxreq_ifstate {

struct p80211msg_lnxreq_ifstate {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];

	p80211item_uint32_t ifstate;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_lnxreq_ifstate_t;

} __attribute__ ((packed));



typedef struct p80211msg_lnxreq_wlansniff {

struct p80211msg_lnxreq_wlansniff {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];
@@ -190,18 +190,18 @@ typedef struct p80211msg_lnxreq_wlansniff { 
	p80211item_uint32_t stripfcs;

	p80211item_uint32_t packet_trunc;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_lnxreq_wlansniff_t;

} __attribute__ ((packed));



typedef struct p80211msg_lnxreq_hostwep {

struct p80211msg_lnxreq_hostwep {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];

	p80211item_uint32_t resultcode;

	p80211item_uint32_t decrypt;

	p80211item_uint32_t encrypt;

} __attribute__ ((packed)) p80211msg_lnxreq_hostwep_t;

} __attribute__ ((packed));



typedef struct p80211msg_lnxreq_commsquality {

struct p80211msg_lnxreq_commsquality {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];
@@ -211,9 +211,9 @@ typedef struct p80211msg_lnxreq_commsquality { 
	p80211item_uint32_t level;

	p80211item_uint32_t noise;

	p80211item_uint32_t txrate;

} __attribute__ ((packed)) p80211msg_lnxreq_commsquality_t;

} __attribute__ ((packed));



typedef struct p80211msg_lnxreq_autojoin {

struct p80211msg_lnxreq_autojoin {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];
@@ -221,26 +221,26 @@ typedef struct p80211msg_lnxreq_autojoin { 
	u8 pad_19D[3];

	p80211item_uint32_t authtype;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_lnxreq_autojoin_t;

} __attribute__ ((packed));



typedef struct p80211msg_p2req_readpda {

struct p80211msg_p2req_readpda {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];

	p80211item_unk1024_t pda;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_p2req_readpda_t;

} __attribute__ ((packed));



typedef struct p80211msg_p2req_ramdl_state {

struct p80211msg_p2req_ramdl_state {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];

	p80211item_uint32_t enable;

	p80211item_uint32_t exeaddr;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_p2req_ramdl_state_t;

} __attribute__ ((packed));



typedef struct p80211msg_p2req_ramdl_write {

struct p80211msg_p2req_ramdl_write {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];
@@ -248,17 +248,17 @@ typedef struct p80211msg_p2req_ramdl_write { 
	p80211item_uint32_t len;

	p80211item_unk4096_t data;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_p2req_ramdl_write_t;

} __attribute__ ((packed));



typedef struct p80211msg_p2req_flashdl_state {

struct p80211msg_p2req_flashdl_state {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];

	p80211item_uint32_t enable;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_p2req_flashdl_state_t;

} __attribute__ ((packed));



typedef struct p80211msg_p2req_flashdl_write {

struct p80211msg_p2req_flashdl_write {

	u32 msgcode;

	u32 msglen;

	u8 devname[WLAN_DEVNAMELEN_MAX];
@@ -266,6 +266,6 @@ typedef struct p80211msg_p2req_flashdl_write { 
	p80211item_uint32_t len;

	p80211item_unk4096_t data;

	p80211item_uint32_t resultcode;

} __attribute__ ((packed)) p80211msg_p2req_flashdl_write_t;

} __attribute__ ((packed));



#endif

drivers/staging/wlan-ng/p80211netdev.c

+5 −4
Original line number Diff line number Diff line
@@ -607,7 +607,8 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) 
		result = -ENOMEM;

	}

bail:

	return result;		/* If allocate,copyfrom or copyto fails, return errno */

	/* If allocate,copyfrom or copyto fails, return errno */

	return result;

}



/*----------------------------------------------------------------
@@ -638,7 +639,7 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) 
static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)

{

	struct sockaddr *new_addr = addr;

	p80211msg_dot11req_mibset_t dot11req;

	struct p80211msg_dot11req_mibset dot11req;

	p80211item_unk392_t *mibattr;

	p80211item_pstr6_t *macaddr;

	p80211item_uint32_t *resultcode;
@@ -654,9 +655,9 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr) 
	resultcode = &dot11req.resultcode;



	/* Set up a dot11req_mibset */

	memset(&dot11req, 0, sizeof(p80211msg_dot11req_mibset_t));

	memset(&dot11req, 0, sizeof(struct p80211msg_dot11req_mibset));

	dot11req.msgcode = DIDmsg_dot11req_mibset;

	dot11req.msglen = sizeof(p80211msg_dot11req_mibset_t);

	dot11req.msglen = sizeof(struct p80211msg_dot11req_mibset);

	memcpy(dot11req.devname,

	       ((wlandevice_t *) dev->ml_priv)->name, WLAN_DEVNAMELEN_MAX - 1);

drivers/staging/wlan-ng/p80211req.c

+6 −6
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 


static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg);

static int p80211req_mibset_mibget(wlandevice_t *wlandev,

				   p80211msg_dot11req_mibget_t *mib_msg,

				   struct p80211msg_dot11req_mibget *mib_msg,

				   int isget);



/*----------------------------------------------------------------
@@ -155,8 +155,8 @@ static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg) 
	switch (msg->msgcode) {



	case DIDmsg_lnxreq_hostwep:{

			p80211msg_lnxreq_hostwep_t *req =

			    (p80211msg_lnxreq_hostwep_t *) msg;

			struct p80211msg_lnxreq_hostwep *req =

			    (struct p80211msg_lnxreq_hostwep *) msg;

			wlandev->hostwep &=

			    ~(HOSTWEP_DECRYPT | HOSTWEP_ENCRYPT);

			if (req->decrypt.data == P80211ENUM_truth_true)
@@ -169,8 +169,8 @@ static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg) 
	case DIDmsg_dot11req_mibget:

	case DIDmsg_dot11req_mibset:{

			int isget = (msg->msgcode == DIDmsg_dot11req_mibget);

			p80211msg_dot11req_mibget_t *mib_msg =

			    (p80211msg_dot11req_mibget_t *) msg;

			struct p80211msg_dot11req_mibget *mib_msg =

			    (struct p80211msg_dot11req_mibget *) msg;

			p80211req_mibset_mibget(wlandev, mib_msg, isget);

		}

	default:
@@ -181,7 +181,7 @@ static void p80211req_handlemsg(wlandevice_t *wlandev, p80211msg_t *msg) 
}



static int p80211req_mibset_mibget(wlandevice_t *wlandev,

				   p80211msg_dot11req_mibget_t *mib_msg,

				   struct p80211msg_dot11req_mibget *mib_msg,

				   int isget)

{

	p80211itemd_t *mibitem = (p80211itemd_t *) mib_msg->mibattribute.data;