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

Commit 5dd8acc8 authored by Svenne Krap's avatar Svenne Krap Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: multiple safe style cleanups 



Cleanups as suggested by checkpatch.pl utiltiy.
.o's from before and after cleanup have matching SHA1s.

Signed-off-by: default avatarSvenne Krap <svenne@krap.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 46800b22

drivers/staging/wlan-ng/hfa384x.h

+37 −37
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ 


/* Make a 32-bit flat address from AUX format 16-bit page and offset */

#define		HFA384x_ADDR_AUX_MKFLAT(p, o)	\

		(((u32)(((u16)(p))&HFA384x_ADDR_AUX_PAGE_MASK)) << 7) | \

		((u32)(((u16)(o))&HFA384x_ADDR_AUX_OFF_MASK))

		((((u32)(((u16)(p))&HFA384x_ADDR_AUX_PAGE_MASK)) << 7) | \

		((u32)(((u16)(o))&HFA384x_ADDR_AUX_OFF_MASK)))



/* Make CMD format offset and page from a 32-bit flat address */

#define		HFA384x_ADDR_CMD_MKPAGE(f) \
@@ -402,7 +402,7 @@ typedef struct hfa384x_authenticateStation_data { 
/*-- Configuration Record: WPAData       (data portion only) --*/

typedef struct hfa384x_WPAData {

	u16 datalen;

	u8 data[0];		// max 80

	u8 data[0];		/* max 80 */

} __attribute__ ((packed)) hfa384x_WPAData_t;



/*--------------------------------------------------------------------

drivers/staging/wlan-ng/hfa384x_usb.c

+4 −4
Original line number Diff line number Diff line
@@ -3649,7 +3649,7 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev, 
		/* check for unencrypted stuff if WEP bit set. */

		if (*(datap - hdrlen + 1) & 0x40)	/* wep set */

			if ((*(datap) == 0xaa) && (*(datap + 1) == 0xaa))

				*(datap - hdrlen + 1) &= 0xbf;	// clear wep; it's the 802.2 header!

				*(datap - hdrlen + 1) &= 0xbf;	/* clear wep; it's the 802.2 header! */

	}



	if (hw->sniff_fcs) {

drivers/staging/wlan-ng/p80211conv.c

+12 −11
Original line number Diff line number Diff line
@@ -206,12 +206,12 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, 
		/* XXXX need to pick keynum other than default? */



		p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC);



		if ((foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,

		foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,

			skb->len,

			(wlandev->hostwep &

			HOSTWEP_DEFAULTKEY_MASK),

				       p80211_wep->iv, p80211_wep->icv))) {

			p80211_wep->iv, p80211_wep->icv);

		if (foo) {

			printk(KERN_WARNING

			       "Host en-WEP failed, dropping frame (%d).\n",

			       foo);
@@ -323,11 +323,12 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, 
			       skb->len);

			return 1;

		}

		if ((foo = wep_decrypt(wlandev, skb->data + payload_offset + 4,

		foo = wep_decrypt(wlandev, skb->data + payload_offset + 4,

			payload_length - 8, -1,

			skb->data + payload_offset,

			skb->data + payload_offset +

				       payload_length - 4))) {

			payload_length - 4);

		if (foo) {

			/* de-wep failed, drop skb. */

			pr_debug("Host de-WEP failed, dropping frame (%d).\n",

				 foo);

drivers/staging/wlan-ng/p80211metadef.h

+9 −9
Original line number Diff line number Diff line
@@ -190,9 +190,9 @@ 
			(P80211DID_MKSECTION(2) | \

			P80211DID_MKGROUP(1))

#define DIDmib_dot11mac_dot11OperationTable_dot11MACAddress \

                        (P80211DID_MKSECTION(2) | \

			((P80211DID_MKSECTION(2) | \

			P80211DID_MKGROUP(1) | \

                        P80211DID_MKITEM(1) | 0x18000000)

			P80211DID_MKITEM(1) | 0x18000000))

#define DIDmib_dot11mac_dot11OperationTable_dot11RTSThreshold \

			(P80211DID_MKSECTION(2) | \

			P80211DID_MKGROUP(1) | \

drivers/staging/wlan-ng/p80211netdev.c

+4 −3
Original line number Diff line number Diff line
@@ -586,7 +586,8 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) 
	}



	/* Allocate a buf of size req->len */

	if ((msgbuf = kmalloc(req->len, GFP_KERNEL))) {

	msgbuf = kmalloc(req->len, GFP_KERNEL);

	if (msgbuf) {

		if (copy_from_user(msgbuf, (void __user *)req->data, req->len))

			result = -EFAULT;

		else