6 files changed, 73 insertions, 73 deletions
diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index 4f430a0c845b..97d7b56c592a 100644
--- a/drivers/staging/ks7010/ks_hostif.c
+++ b/drivers/staging/ks7010/ks_hostif.c
@@ -1101,7 +1101,7 @@ void hostif_event_check(struct ks_wlan_private *priv)
        priv->hostt.qtail = (priv->hostt.qtail + 1) % SME_EVENT_BUFF_SIZE;
 }
-#define CHECK_ALINE(size) (size%4 ? (size+(4-(size%4))):size)
+#define CHECK_ALINE(size) (size % 4 ? (size + (4 - (size % 4))) : size)
 int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *packet)
 {
diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h
index 743f31ead56e..30c49b699d62 100644
--- a/drivers/staging/ks7010/ks_hostif.h
+++ b/drivers/staging/ks7010/ks_hostif.h
@@ -553,34 +553,34 @@ struct hostif_mic_failure_confirm_t {
 #define TX_RATE_FIXED           5
 /* 11b rate */
-#define TX_RATE_1M      (uint8_t)(10/5) /* 11b 11g basic rate */
+#define TX_RATE_1M      (uint8_t)(10 / 5)       /* 11b 11g basic rate */
-#define TX_RATE_2M      (uint8_t)(20/5) /* 11b 11g basic rate */
+#define TX_RATE_2M      (uint8_t)(20 / 5)       /* 11b 11g basic rate */
-#define TX_RATE_5M      (uint8_t)(55/5) /* 11g basic rate */
+#define TX_RATE_5M      (uint8_t)(55 / 5)       /* 11g basic rate */
-#define TX_RATE_11M     (uint8_t)(110/5)        /* 11g basic rate */
+#define TX_RATE_11M     (uint8_t)(110 / 5)      /* 11g basic rate */
 /* 11g rate */
-#define TX_RATE_6M      (uint8_t)(60/5) /* 11g basic rate */
+#define TX_RATE_6M      (uint8_t)(60 / 5)       /* 11g basic rate */
-#define TX_RATE_12M     (uint8_t)(120/5)        /* 11g basic rate */
+#define TX_RATE_12M     (uint8_t)(120 / 5)      /* 11g basic rate */
-#define TX_RATE_24M     (uint8_t)(240/5)        /* 11g basic rate */
+#define TX_RATE_24M     (uint8_t)(240 / 5)      /* 11g basic rate */
-#define TX_RATE_9M      (uint8_t)(90/5)
+#define TX_RATE_9M      (uint8_t)(90 / 5)
-#define TX_RATE_18M     (uint8_t)(180/5)
+#define TX_RATE_18M     (uint8_t)(180 / 5)
-#define TX_RATE_36M     (uint8_t)(360/5)
+#define TX_RATE_36M     (uint8_t)(360 / 5)
-#define TX_RATE_48M     (uint8_t)(480/5)
+#define TX_RATE_48M     (uint8_t)(480 / 5)
-#define TX_RATE_54M     (uint8_t)(540/5)
+#define TX_RATE_54M     (uint8_t)(540 / 5)
-#define IS_11B_RATE(A) (((A&RATE_MASK)==TX_RATE_1M)||((A&RATE_MASK)==TX_RATE_2M)||\
+#define IS_11B_RATE(A) (((A & RATE_MASK) == TX_RATE_1M ) || ((A & RATE_MASK) == TX_RATE_2M) || \
-                        ((A&RATE_MASK)==TX_RATE_5M)||((A&RATE_MASK)==TX_RATE_11M))
+                        ((A & RATE_MASK) == TX_RATE_5M) || ((A & RATE_MASK) == TX_RATE_11M))
-#define IS_OFDM_RATE(A) (((A&RATE_MASK)==TX_RATE_6M)||((A&RATE_MASK)==TX_RATE_12M)||\
+#define IS_OFDM_RATE(A) (((A & RATE_MASK) == TX_RATE_6M) || ((A & RATE_MASK) == TX_RATE_12M) || \
-                        ((A&RATE_MASK)==TX_RATE_24M)||((A&RATE_MASK)==TX_RATE_9M)||\
+                        ((A & RATE_MASK) == TX_RATE_24M) || ((A & RATE_MASK) == TX_RATE_9M) || \
-                        ((A&RATE_MASK)==TX_RATE_18M)||((A&RATE_MASK)==TX_RATE_36M)||\
+                        ((A & RATE_MASK) == TX_RATE_18M) || ((A & RATE_MASK) == TX_RATE_36M) || \
-                        ((A&RATE_MASK)==TX_RATE_48M)||((A&RATE_MASK)==TX_RATE_54M))
+                        ((A & RATE_MASK) == TX_RATE_48M) || ((A & RATE_MASK) == TX_RATE_54M))
-#define IS_11BG_RATE(A) (IS_11B_RATE(A)||IS_OFDM_RATE(A))
+#define IS_11BG_RATE(A) (IS_11B_RATE(A) || IS_OFDM_RATE(A))
-#define IS_OFDM_EXT_RATE(A)  (((A&RATE_MASK)==TX_RATE_9M)||((A&RATE_MASK)==TX_RATE_18M)||\
+#define IS_OFDM_EXT_RATE(A)  (((A & RATE_MASK) == TX_RATE_9M) || ((A & RATE_MASK) == TX_RATE_18M) || \
-                             ((A&RATE_MASK)==TX_RATE_36M)||((A&RATE_MASK)==TX_RATE_48M)||\
+                             ((A & RATE_MASK) == TX_RATE_36M) || ((A & RATE_MASK) == TX_RATE_48M) || \
-                             ((A&RATE_MASK)==TX_RATE_54M))
+                             ((A & RATE_MASK) == TX_RATE_54M))
 enum {
        CONNECT_STATUS = 0,
@@ -602,16 +602,16 @@ enum {
 /* macro function */
 #define HIF_EVENT_MASK 0xE800
-#define IS_HIF_IND(_EVENT)  ((_EVENT&HIF_EVENT_MASK)==0xE800  && \
+#define IS_HIF_IND(_EVENT)  ((_EVENT & HIF_EVENT_MASK) == 0xE800  && \
-                             ((_EVENT&~HIF_EVENT_MASK)==0x0001 || \
+                             ((_EVENT & ~HIF_EVENT_MASK) == 0x0001 || \
-                              (_EVENT&~HIF_EVENT_MASK)==0x0006 || \
+                              (_EVENT & ~HIF_EVENT_MASK) == 0x0006 || \
-                              (_EVENT&~HIF_EVENT_MASK)==0x000C || \
+                              (_EVENT & ~HIF_EVENT_MASK) == 0x000C || \
-                              (_EVENT&~HIF_EVENT_MASK)==0x0011 || \
+                              (_EVENT & ~HIF_EVENT_MASK) == 0x0011 || \
-                              (_EVENT&~HIF_EVENT_MASK)==0x0012))
+                              (_EVENT & ~HIF_EVENT_MASK) == 0x0012))
-#define IS_HIF_CONF(_EVENT) ((_EVENT&HIF_EVENT_MASK)==0xE800  && \
+#define IS_HIF_CONF(_EVENT) ((_EVENT & HIF_EVENT_MASK) == 0xE800  && \
-                             (_EVENT&~HIF_EVENT_MASK)>0x0000  && \
+                             (_EVENT & ~HIF_EVENT_MASK) > 0x0000  && \
-                             (_EVENT&~HIF_EVENT_MASK)<0x0012  && \
+                             (_EVENT & ~HIF_EVENT_MASK) < 0x0012  && \
                             !IS_HIF_IND(_EVENT) )
 #ifdef __KERNEL__
diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h
index f0c083b2b6aa..9ab80e1f123e 100644
--- a/drivers/staging/ks7010/ks_wlan.h
+++ b/drivers/staging/ks7010/ks_wlan.h
@@ -36,7 +36,7 @@
 #ifdef KS_WLAN_DEBUG
 #define DPRINTK(n, fmt, args...) \
-                 if (KS_WLAN_DEBUG>(n)) printk(KERN_NOTICE "%s: "fmt, __FUNCTION__, ## args)
+                 if (KS_WLAN_DEBUG > (n)) printk(KERN_NOTICE "%s: "fmt, __FUNCTION__, ## args)
 #else
 #define DPRINTK(n, fmt, args...)
 #endif
@@ -94,7 +94,7 @@ enum {
 #define SME_WEP_VAL2        (1<<6)
 #define SME_WEP_VAL3        (1<<7)
 #define SME_WEP_VAL4        (1<<8)
-#define SME_WEP_VAL_MASK    (SME_WEP_VAL1|SME_WEP_VAL2|SME_WEP_VAL3|SME_WEP_VAL4)
+#define SME_WEP_VAL_MASK    (SME_WEP_VAL1 | SME_WEP_VAL2 | SME_WEP_VAL3 | SME_WEP_VAL4)
 #define SME_RSN             (1<<9)
 #define SME_RSN_MULTICAST   (1<<10)
 #define SME_RSN_UNICAST     (1<<11)
diff --git a/drivers/staging/ks7010/ks_wlan_ioctl.h b/drivers/staging/ks7010/ks_wlan_ioctl.h
index 84554b6bb239..8e62b10effd6 100644
--- a/drivers/staging/ks7010/ks_wlan_ioctl.h
+++ b/drivers/staging/ks7010/ks_wlan_ioctl.h
@@ -15,43 +15,43 @@
 #include <linux/wireless.h>
 /* The low order bit identify a SET (0) or a GET (1) ioctl.  */
-/*                                      SIOCIWFIRSTPRIV+0 */
+/*                                      SIOCIWFIRSTPRIV + 0 */
-/* former KS_WLAN_GET_DRIVER_VERSION    SIOCIWFIRSTPRIV+1 */
+/* former KS_WLAN_GET_DRIVER_VERSION    SIOCIWFIRSTPRIV + 1 */
-/*                                      SIOCIWFIRSTPRIV+2 */
+/*                                      SIOCIWFIRSTPRIV + 2 */
-#define KS_WLAN_GET_FIRM_VERSION        SIOCIWFIRSTPRIV+3
+#define KS_WLAN_GET_FIRM_VERSION        SIOCIWFIRSTPRIV + 3
 #ifdef WPS
-#define KS_WLAN_SET_WPS_ENABLE          SIOCIWFIRSTPRIV+4
+#define KS_WLAN_SET_WPS_ENABLE          SIOCIWFIRSTPRIV + 4
-#define KS_WLAN_GET_WPS_ENABLE          SIOCIWFIRSTPRIV+5
+#define KS_WLAN_GET_WPS_ENABLE          SIOCIWFIRSTPRIV + 5
-#define KS_WLAN_SET_WPS_PROBE_REQ       SIOCIWFIRSTPRIV+6
+#define KS_WLAN_SET_WPS_PROBE_REQ       SIOCIWFIRSTPRIV + 6
 #endif
-#define KS_WLAN_GET_EEPROM_CKSUM        SIOCIWFIRSTPRIV+7
+#define KS_WLAN_GET_EEPROM_CKSUM        SIOCIWFIRSTPRIV + 7
-#define KS_WLAN_SET_PREAMBLE            SIOCIWFIRSTPRIV+8
+#define KS_WLAN_SET_PREAMBLE            SIOCIWFIRSTPRIV + 8
-#define KS_WLAN_GET_PREAMBLE            SIOCIWFIRSTPRIV+9
+#define KS_WLAN_GET_PREAMBLE            SIOCIWFIRSTPRIV + 9
-#define KS_WLAN_SET_POWER_SAVE          SIOCIWFIRSTPRIV+10
+#define KS_WLAN_SET_POWER_SAVE          SIOCIWFIRSTPRIV + 10
-#define KS_WLAN_GET_POWER_SAVE          SIOCIWFIRSTPRIV+11
+#define KS_WLAN_GET_POWER_SAVE          SIOCIWFIRSTPRIV + 11
-#define KS_WLAN_SET_SCAN_TYPE           SIOCIWFIRSTPRIV+12
+#define KS_WLAN_SET_SCAN_TYPE           SIOCIWFIRSTPRIV + 12
-#define KS_WLAN_GET_SCAN_TYPE           SIOCIWFIRSTPRIV+13
+#define KS_WLAN_GET_SCAN_TYPE           SIOCIWFIRSTPRIV + 13
-#define KS_WLAN_SET_RX_GAIN             SIOCIWFIRSTPRIV+14
+#define KS_WLAN_SET_RX_GAIN             SIOCIWFIRSTPRIV + 14
-#define KS_WLAN_GET_RX_GAIN             SIOCIWFIRSTPRIV+15
+#define KS_WLAN_GET_RX_GAIN             SIOCIWFIRSTPRIV + 15
-#define KS_WLAN_HOSTT                   SIOCIWFIRSTPRIV+16      /* unused */
+#define KS_WLAN_HOSTT                   SIOCIWFIRSTPRIV + 16    /* unused */
-//#define KS_WLAN_SET_REGION            SIOCIWFIRSTPRIV+17
+//#define KS_WLAN_SET_REGION            SIOCIWFIRSTPRIV + 17
-#define KS_WLAN_SET_BEACON_LOST         SIOCIWFIRSTPRIV+18
+#define KS_WLAN_SET_BEACON_LOST         SIOCIWFIRSTPRIV + 18
-#define KS_WLAN_GET_BEACON_LOST         SIOCIWFIRSTPRIV+19
+#define KS_WLAN_GET_BEACON_LOST         SIOCIWFIRSTPRIV + 19
-#define KS_WLAN_SET_TX_GAIN             SIOCIWFIRSTPRIV+20
+#define KS_WLAN_SET_TX_GAIN             SIOCIWFIRSTPRIV + 20
-#define KS_WLAN_GET_TX_GAIN             SIOCIWFIRSTPRIV+21
+#define KS_WLAN_GET_TX_GAIN             SIOCIWFIRSTPRIV + 21
 /* for KS7010 */
-#define KS_WLAN_SET_PHY_TYPE            SIOCIWFIRSTPRIV+22
+#define KS_WLAN_SET_PHY_TYPE            SIOCIWFIRSTPRIV + 22
-#define KS_WLAN_GET_PHY_TYPE            SIOCIWFIRSTPRIV+23
+#define KS_WLAN_GET_PHY_TYPE            SIOCIWFIRSTPRIV + 23
-#define KS_WLAN_SET_CTS_MODE            SIOCIWFIRSTPRIV+24
+#define KS_WLAN_SET_CTS_MODE            SIOCIWFIRSTPRIV + 24
-#define KS_WLAN_GET_CTS_MODE            SIOCIWFIRSTPRIV+25
+#define KS_WLAN_GET_CTS_MODE            SIOCIWFIRSTPRIV + 25
-/*                                      SIOCIWFIRSTPRIV+26 */
+/*                                      SIOCIWFIRSTPRIV + 26 */
-/*                                      SIOCIWFIRSTPRIV+27 */
+/*                                      SIOCIWFIRSTPRIV + 27 */
-#define KS_WLAN_SET_SLEEP_MODE          SIOCIWFIRSTPRIV+28      /* sleep mode */
+#define KS_WLAN_SET_SLEEP_MODE          SIOCIWFIRSTPRIV + 28    /* sleep mode */
-#define KS_WLAN_GET_SLEEP_MODE          SIOCIWFIRSTPRIV+29      /* sleep mode */
+#define KS_WLAN_GET_SLEEP_MODE          SIOCIWFIRSTPRIV + 29    /* sleep mode */
-/*                                      SIOCIWFIRSTPRIV+30 */
+/*                                      SIOCIWFIRSTPRIV + 30 */
-/*                                      SIOCIWFIRSTPRIV+31 */
+/*                                      SIOCIWFIRSTPRIV + 31 */
 #ifdef __KERNEL__
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index e7cbe001235b..121e1530fdba 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -2451,7 +2451,7 @@ static int ks_wlan_data_read(struct net_device *dev,
 #if 0
 /*------------------------------------------------------------------*/
 /* Private handler : get wep string */
-#define WEP_ASCII_BUFF_SIZE (17+64*4+1)
+#define WEP_ASCII_BUFF_SIZE (17 + 64 * 4 + 1)
 static int ks_wlan_get_wep_ascii(struct net_device *dev,
                                 struct iw_request_info *info,
                                 struct iw_point *dwrq, char *extra)
@@ -3392,7 +3392,7 @@ int ks_wlan_close(struct net_device *dev)
 /* Operational parameters that usually are not changed. */
 /* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT  (3*HZ)
+#define TX_TIMEOUT  (3 * HZ)
 static const unsigned char dummy_addr[] = {
        0x00, 0x0b, 0xe3, 0x00, 0x00, 0x00
 };
diff --git a/drivers/staging/ks7010/michael_mic.c b/drivers/staging/ks7010/michael_mic.c
index 2f535c08e172..f6e70fa2a12f 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -14,11 +14,11 @@
 #include "michael_mic.h"
 // Rotation functions on 32 bit values
-#define ROL32(A, n)     (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
+#define ROL32(A, n)     (((A) << (n)) | (((A) >> (32 - (n))) & ((1UL << (n)) - 1)))
-#define ROR32(A, n)     ROL32((A), 32-(n))
+#define ROR32(A, n)     ROL32((A), 32 - (n))
 // Convert from Byte[] to UInt32 in a portable way
-#define getUInt32(A, B) ((uint32_t)(A[B+0] << 0) \
+#define getUInt32(A, B) ((uint32_t)(A[B + 0] << 0) \
-                + (A[B+1] << 8) + (A[B+2] << 16) + (A[B+3] << 24))
+                + (A[B + 1] << 8) + (A[B + 2] << 16) + (A[B + 3] << 24))
 // Convert from UInt32 to Byte[] in a portable way
 #define putUInt32(A, B, C)                                      \

diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 4f430a0c845b..97d7b56c592a 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c
@@ -1101,7 +1101,7 @@ void hostif_event_check(struct ks_wlan_private *priv)
1101	priv->hostt.qtail = (priv->hostt.qtail + 1) % SME_EVENT_BUFF_SIZE;	1101	priv->hostt.qtail = (priv->hostt.qtail + 1) % SME_EVENT_BUFF_SIZE;
1102	}	1102	}
1103		1103
1104	#define CHECK_ALINE(size) (size%4 ? (size+(4-(size%4))):size)	1104	#define CHECK_ALINE(size) (size % 4 ? (size + (4 - (size % 4))) : size)
1105		1105
1106	int hostif_data_request(struct ks_wlan_private priv, struct sk_buff packet)	1106	int hostif_data_request(struct ks_wlan_private priv, struct sk_buff packet)
1107	{	1107	{


diff --git a/drivers/staging/ks7010/ks_hostif.h b/drivers/staging/ks7010/ks_hostif.h index 743f31ead56e..30c49b699d62 100644 --- a/drivers/staging/ks7010/ks_hostif.h +++ b/drivers/staging/ks7010/ks_hostif.h
@@ -553,34 +553,34 @@ struct hostif_mic_failure_confirm_t {
553	#define TX_RATE_FIXED 5	553	#define TX_RATE_FIXED 5
554		554
555	/* 11b rate */	555	/* 11b rate */
556	#define TX_RATE_1M (uint8_t)(10/5) /* 11b 11g basic rate */	556	#define TX_RATE_1M (uint8_t)(10 / 5) /* 11b 11g basic rate */
557	#define TX_RATE_2M (uint8_t)(20/5) /* 11b 11g basic rate */	557	#define TX_RATE_2M (uint8_t)(20 / 5) /* 11b 11g basic rate */
558	#define TX_RATE_5M (uint8_t)(55/5) /* 11g basic rate */	558	#define TX_RATE_5M (uint8_t)(55 / 5) /* 11g basic rate */
559	#define TX_RATE_11M (uint8_t)(110/5) /* 11g basic rate */	559	#define TX_RATE_11M (uint8_t)(110 / 5) /* 11g basic rate */
560		560
561	/* 11g rate */	561	/* 11g rate */
562	#define TX_RATE_6M (uint8_t)(60/5) /* 11g basic rate */	562	#define TX_RATE_6M (uint8_t)(60 / 5) /* 11g basic rate */
563	#define TX_RATE_12M (uint8_t)(120/5) /* 11g basic rate */	563	#define TX_RATE_12M (uint8_t)(120 / 5) /* 11g basic rate */
564	#define TX_RATE_24M (uint8_t)(240/5) /* 11g basic rate */	564	#define TX_RATE_24M (uint8_t)(240 / 5) /* 11g basic rate */
565	#define TX_RATE_9M (uint8_t)(90/5)	565	#define TX_RATE_9M (uint8_t)(90 / 5)
566	#define TX_RATE_18M (uint8_t)(180/5)	566	#define TX_RATE_18M (uint8_t)(180 / 5)
567	#define TX_RATE_36M (uint8_t)(360/5)	567	#define TX_RATE_36M (uint8_t)(360 / 5)
568	#define TX_RATE_48M (uint8_t)(480/5)	568	#define TX_RATE_48M (uint8_t)(480 / 5)
569	#define TX_RATE_54M (uint8_t)(540/5)	569	#define TX_RATE_54M (uint8_t)(540 / 5)
570		570
571	#define IS_11B_RATE(A) (((A&RATE_MASK)==TX_RATE_1M)\|\|((A&RATE_MASK)==TX_RATE_2M)\|\|\	571	#define IS_11B_RATE(A) (((A & RATE_MASK) == TX_RATE_1M ) \|\| ((A & RATE_MASK) == TX_RATE_2M) \|\| \
572	((A&RATE_MASK)==TX_RATE_5M)\|\|((A&RATE_MASK)==TX_RATE_11M))	572	((A & RATE_MASK) == TX_RATE_5M) \|\| ((A & RATE_MASK) == TX_RATE_11M))
573		573
574	#define IS_OFDM_RATE(A) (((A&RATE_MASK)==TX_RATE_6M)\|\|((A&RATE_MASK)==TX_RATE_12M)\|\|\	574	#define IS_OFDM_RATE(A) (((A & RATE_MASK) == TX_RATE_6M) \|\| ((A & RATE_MASK) == TX_RATE_12M) \|\| \
575	((A&RATE_MASK)==TX_RATE_24M)\|\|((A&RATE_MASK)==TX_RATE_9M)\|\|\	575	((A & RATE_MASK) == TX_RATE_24M) \|\| ((A & RATE_MASK) == TX_RATE_9M) \|\| \
576	((A&RATE_MASK)==TX_RATE_18M)\|\|((A&RATE_MASK)==TX_RATE_36M)\|\|\	576	((A & RATE_MASK) == TX_RATE_18M) \|\| ((A & RATE_MASK) == TX_RATE_36M) \|\| \
577	((A&RATE_MASK)==TX_RATE_48M)\|\|((A&RATE_MASK)==TX_RATE_54M))	577	((A & RATE_MASK) == TX_RATE_48M) \|\| ((A & RATE_MASK) == TX_RATE_54M))
578		578
579	#define IS_11BG_RATE(A) (IS_11B_RATE(A)\|\|IS_OFDM_RATE(A))	579	#define IS_11BG_RATE(A) (IS_11B_RATE(A) \|\| IS_OFDM_RATE(A))
580		580
581	#define IS_OFDM_EXT_RATE(A) (((A&RATE_MASK)==TX_RATE_9M)\|\|((A&RATE_MASK)==TX_RATE_18M)\|\|\	581	#define IS_OFDM_EXT_RATE(A) (((A & RATE_MASK) == TX_RATE_9M) \|\| ((A & RATE_MASK) == TX_RATE_18M) \|\| \
582	((A&RATE_MASK)==TX_RATE_36M)\|\|((A&RATE_MASK)==TX_RATE_48M)\|\|\	582	((A & RATE_MASK) == TX_RATE_36M) \|\| ((A & RATE_MASK) == TX_RATE_48M) \|\| \
583	((A&RATE_MASK)==TX_RATE_54M))	583	((A & RATE_MASK) == TX_RATE_54M))
584		584
585	enum {	585	enum {
586	CONNECT_STATUS = 0,	586	CONNECT_STATUS = 0,
@@ -602,16 +602,16 @@ enum {
602		602
603	/* macro function */	603	/* macro function */
604	#define HIF_EVENT_MASK 0xE800	604	#define HIF_EVENT_MASK 0xE800
605	#define IS_HIF_IND(_EVENT) ((_EVENT&HIF_EVENT_MASK)==0xE800 && \	605	#define IS_HIF_IND(_EVENT) ((_EVENT & HIF_EVENT_MASK) == 0xE800 && \
606	((_EVENT&~HIF_EVENT_MASK)==0x0001 \|\| \	606	((_EVENT & ~HIF_EVENT_MASK) == 0x0001 \|\| \
607	(_EVENT&~HIF_EVENT_MASK)==0x0006 \|\| \	607	(_EVENT & ~HIF_EVENT_MASK) == 0x0006 \|\| \
608	(_EVENT&~HIF_EVENT_MASK)==0x000C \|\| \	608	(_EVENT & ~HIF_EVENT_MASK) == 0x000C \|\| \
609	(_EVENT&~HIF_EVENT_MASK)==0x0011 \|\| \	609	(_EVENT & ~HIF_EVENT_MASK) == 0x0011 \|\| \
610	(_EVENT&~HIF_EVENT_MASK)==0x0012))	610	(_EVENT & ~HIF_EVENT_MASK) == 0x0012))
611		611
612	#define IS_HIF_CONF(_EVENT) ((_EVENT&HIF_EVENT_MASK)==0xE800 && \	612	#define IS_HIF_CONF(_EVENT) ((_EVENT & HIF_EVENT_MASK) == 0xE800 && \
613	(_EVENT&~HIF_EVENT_MASK)>0x0000 && \	613	(_EVENT & ~HIF_EVENT_MASK) > 0x0000 && \
614	(_EVENT&~HIF_EVENT_MASK)<0x0012 && \	614	(_EVENT & ~HIF_EVENT_MASK) < 0x0012 && \
615	!IS_HIF_IND(_EVENT) )	615	!IS_HIF_IND(_EVENT) )
616		616
617	#ifdef __KERNEL__	617	#ifdef __KERNEL__


diff --git a/drivers/staging/ks7010/ks_wlan.h b/drivers/staging/ks7010/ks_wlan.h index f0c083b2b6aa..9ab80e1f123e 100644 --- a/drivers/staging/ks7010/ks_wlan.h +++ b/drivers/staging/ks7010/ks_wlan.h
@@ -36,7 +36,7 @@
36		36
37	#ifdef KS_WLAN_DEBUG	37	#ifdef KS_WLAN_DEBUG
38	#define DPRINTK(n, fmt, args...) \	38	#define DPRINTK(n, fmt, args...) \
39	if (KS_WLAN_DEBUG>(n)) printk(KERN_NOTICE "%s: "fmt, __FUNCTION__, ## args)	39	if (KS_WLAN_DEBUG > (n)) printk(KERN_NOTICE "%s: "fmt, __FUNCTION__, ## args)
40	#else	40	#else
41	#define DPRINTK(n, fmt, args...)	41	#define DPRINTK(n, fmt, args...)
42	#endif	42	#endif
@@ -94,7 +94,7 @@ enum {
94	#define SME_WEP_VAL2 (1<<6)	94	#define SME_WEP_VAL2 (1<<6)
95	#define SME_WEP_VAL3 (1<<7)	95	#define SME_WEP_VAL3 (1<<7)
96	#define SME_WEP_VAL4 (1<<8)	96	#define SME_WEP_VAL4 (1<<8)
97	#define SME_WEP_VAL_MASK (SME_WEP_VAL1\|SME_WEP_VAL2\|SME_WEP_VAL3\|SME_WEP_VAL4)	97	#define SME_WEP_VAL_MASK (SME_WEP_VAL1 \| SME_WEP_VAL2 \| SME_WEP_VAL3 \| SME_WEP_VAL4)
98	#define SME_RSN (1<<9)	98	#define SME_RSN (1<<9)
99	#define SME_RSN_MULTICAST (1<<10)	99	#define SME_RSN_MULTICAST (1<<10)
100	#define SME_RSN_UNICAST (1<<11)	100	#define SME_RSN_UNICAST (1<<11)


diff --git a/drivers/staging/ks7010/ks_wlan_ioctl.h b/drivers/staging/ks7010/ks_wlan_ioctl.h index 84554b6bb239..8e62b10effd6 100644 --- a/drivers/staging/ks7010/ks_wlan_ioctl.h +++ b/drivers/staging/ks7010/ks_wlan_ioctl.h
@@ -15,43 +15,43 @@
15	#include <linux/wireless.h>	15	#include <linux/wireless.h>
16	/* The low order bit identify a SET (0) or a GET (1) ioctl. */	16	/* The low order bit identify a SET (0) or a GET (1) ioctl. */
17		17
18	/* SIOCIWFIRSTPRIV+0 */	18	/* SIOCIWFIRSTPRIV + 0 */
19	/* former KS_WLAN_GET_DRIVER_VERSION SIOCIWFIRSTPRIV+1 */	19	/* former KS_WLAN_GET_DRIVER_VERSION SIOCIWFIRSTPRIV + 1 */
20	/* SIOCIWFIRSTPRIV+2 */	20	/* SIOCIWFIRSTPRIV + 2 */
21	#define KS_WLAN_GET_FIRM_VERSION SIOCIWFIRSTPRIV+3	21	#define KS_WLAN_GET_FIRM_VERSION SIOCIWFIRSTPRIV + 3
22	#ifdef WPS	22	#ifdef WPS
23	#define KS_WLAN_SET_WPS_ENABLE SIOCIWFIRSTPRIV+4	23	#define KS_WLAN_SET_WPS_ENABLE SIOCIWFIRSTPRIV + 4
24	#define KS_WLAN_GET_WPS_ENABLE SIOCIWFIRSTPRIV+5	24	#define KS_WLAN_GET_WPS_ENABLE SIOCIWFIRSTPRIV + 5
25	#define KS_WLAN_SET_WPS_PROBE_REQ SIOCIWFIRSTPRIV+6	25	#define KS_WLAN_SET_WPS_PROBE_REQ SIOCIWFIRSTPRIV + 6
26	#endif	26	#endif
27	#define KS_WLAN_GET_EEPROM_CKSUM SIOCIWFIRSTPRIV+7	27	#define KS_WLAN_GET_EEPROM_CKSUM SIOCIWFIRSTPRIV + 7
28	#define KS_WLAN_SET_PREAMBLE SIOCIWFIRSTPRIV+8	28	#define KS_WLAN_SET_PREAMBLE SIOCIWFIRSTPRIV + 8
29	#define KS_WLAN_GET_PREAMBLE SIOCIWFIRSTPRIV+9	29	#define KS_WLAN_GET_PREAMBLE SIOCIWFIRSTPRIV + 9
30	#define KS_WLAN_SET_POWER_SAVE SIOCIWFIRSTPRIV+10	30	#define KS_WLAN_SET_POWER_SAVE SIOCIWFIRSTPRIV + 10
31	#define KS_WLAN_GET_POWER_SAVE SIOCIWFIRSTPRIV+11	31	#define KS_WLAN_GET_POWER_SAVE SIOCIWFIRSTPRIV + 11
32	#define KS_WLAN_SET_SCAN_TYPE SIOCIWFIRSTPRIV+12	32	#define KS_WLAN_SET_SCAN_TYPE SIOCIWFIRSTPRIV + 12
33	#define KS_WLAN_GET_SCAN_TYPE SIOCIWFIRSTPRIV+13	33	#define KS_WLAN_GET_SCAN_TYPE SIOCIWFIRSTPRIV + 13
34	#define KS_WLAN_SET_RX_GAIN SIOCIWFIRSTPRIV+14	34	#define KS_WLAN_SET_RX_GAIN SIOCIWFIRSTPRIV + 14
35	#define KS_WLAN_GET_RX_GAIN SIOCIWFIRSTPRIV+15	35	#define KS_WLAN_GET_RX_GAIN SIOCIWFIRSTPRIV + 15
36	#define KS_WLAN_HOSTT SIOCIWFIRSTPRIV+16 /* unused */	36	#define KS_WLAN_HOSTT SIOCIWFIRSTPRIV + 16 /* unused */
37	//#define KS_WLAN_SET_REGION SIOCIWFIRSTPRIV+17	37	//#define KS_WLAN_SET_REGION SIOCIWFIRSTPRIV + 17
38	#define KS_WLAN_SET_BEACON_LOST SIOCIWFIRSTPRIV+18	38	#define KS_WLAN_SET_BEACON_LOST SIOCIWFIRSTPRIV + 18
39	#define KS_WLAN_GET_BEACON_LOST SIOCIWFIRSTPRIV+19	39	#define KS_WLAN_GET_BEACON_LOST SIOCIWFIRSTPRIV + 19
40		40
41	#define KS_WLAN_SET_TX_GAIN SIOCIWFIRSTPRIV+20	41	#define KS_WLAN_SET_TX_GAIN SIOCIWFIRSTPRIV + 20
42	#define KS_WLAN_GET_TX_GAIN SIOCIWFIRSTPRIV+21	42	#define KS_WLAN_GET_TX_GAIN SIOCIWFIRSTPRIV + 21
43		43
44	/* for KS7010 */	44	/* for KS7010 */
45	#define KS_WLAN_SET_PHY_TYPE SIOCIWFIRSTPRIV+22	45	#define KS_WLAN_SET_PHY_TYPE SIOCIWFIRSTPRIV + 22
46	#define KS_WLAN_GET_PHY_TYPE SIOCIWFIRSTPRIV+23	46	#define KS_WLAN_GET_PHY_TYPE SIOCIWFIRSTPRIV + 23
47	#define KS_WLAN_SET_CTS_MODE SIOCIWFIRSTPRIV+24	47	#define KS_WLAN_SET_CTS_MODE SIOCIWFIRSTPRIV + 24
48	#define KS_WLAN_GET_CTS_MODE SIOCIWFIRSTPRIV+25	48	#define KS_WLAN_GET_CTS_MODE SIOCIWFIRSTPRIV + 25
49	/* SIOCIWFIRSTPRIV+26 */	49	/* SIOCIWFIRSTPRIV + 26 */
50	/* SIOCIWFIRSTPRIV+27 */	50	/* SIOCIWFIRSTPRIV + 27 */
51	#define KS_WLAN_SET_SLEEP_MODE SIOCIWFIRSTPRIV+28 /* sleep mode */	51	#define KS_WLAN_SET_SLEEP_MODE SIOCIWFIRSTPRIV + 28 /* sleep mode */
52	#define KS_WLAN_GET_SLEEP_MODE SIOCIWFIRSTPRIV+29 /* sleep mode */	52	#define KS_WLAN_GET_SLEEP_MODE SIOCIWFIRSTPRIV + 29 /* sleep mode */
53	/* SIOCIWFIRSTPRIV+30 */	53	/* SIOCIWFIRSTPRIV + 30 */
54	/* SIOCIWFIRSTPRIV+31 */	54	/* SIOCIWFIRSTPRIV + 31 */
55		55
56	#ifdef __KERNEL__	56	#ifdef __KERNEL__
57		57


diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index e7cbe001235b..121e1530fdba 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -2451,7 +2451,7 @@ static int ks_wlan_data_read(struct net_device *dev,
2451	#if 0	2451	#if 0
2452	/------------------------------------------------------------------/	2452	/------------------------------------------------------------------/
2453	/* Private handler : get wep string */	2453	/* Private handler : get wep string */
2454	#define WEP_ASCII_BUFF_SIZE (17+64*4+1)	2454	#define WEP_ASCII_BUFF_SIZE (17 + 64 * 4 + 1)
2455	static int ks_wlan_get_wep_ascii(struct net_device *dev,	2455	static int ks_wlan_get_wep_ascii(struct net_device *dev,
2456	struct iw_request_info *info,	2456	struct iw_request_info *info,
2457	struct iw_point dwrq, char extra)	2457	struct iw_point dwrq, char extra)
@@ -3392,7 +3392,7 @@ int ks_wlan_close(struct net_device *dev)
3392		3392
3393	/* Operational parameters that usually are not changed. */	3393	/* Operational parameters that usually are not changed. */
3394	/* Time in jiffies before concluding the transmitter is hung. */	3394	/* Time in jiffies before concluding the transmitter is hung. */
3395	#define TX_TIMEOUT (3*HZ)	3395	#define TX_TIMEOUT (3 * HZ)
3396	static const unsigned char dummy_addr[] = {	3396	static const unsigned char dummy_addr[] = {
3397	0x00, 0x0b, 0xe3, 0x00, 0x00, 0x00	3397	0x00, 0x0b, 0xe3, 0x00, 0x00, 0x00
3398	};	3398	};


diff --git a/drivers/staging/ks7010/michael_mic.c b/drivers/staging/ks7010/michael_mic.c index 2f535c08e172..f6e70fa2a12f 100644 --- a/drivers/staging/ks7010/michael_mic.c +++ b/drivers/staging/ks7010/michael_mic.c
@@ -14,11 +14,11 @@
14	#include "michael_mic.h"	14	#include "michael_mic.h"
15		15
16	// Rotation functions on 32 bit values	16	// Rotation functions on 32 bit values
17	#define ROL32(A, n) (((A) << (n)) \| (((A)>>(32-(n))) & ((1UL << (n)) - 1)))	17	#define ROL32(A, n) (((A) << (n)) \| (((A) >> (32 - (n))) & ((1UL << (n)) - 1)))
18	#define ROR32(A, n) ROL32((A), 32-(n))	18	#define ROR32(A, n) ROL32((A), 32 - (n))
19	// Convert from Byte[] to UInt32 in a portable way	19	// Convert from Byte[] to UInt32 in a portable way
20	#define getUInt32(A, B) ((uint32_t)(A[B+0] << 0) \	20	#define getUInt32(A, B) ((uint32_t)(A[B + 0] << 0) \
21	+ (A[B+1] << 8) + (A[B+2] << 16) + (A[B+3] << 24))	21	+ (A[B + 1] << 8) + (A[B + 2] << 16) + (A[B + 3] << 24))
22		22
23	// Convert from UInt32 to Byte[] in a portable way	23	// Convert from UInt32 to Byte[] in a portable way
24	#define putUInt32(A, B, C) \	24	#define putUInt32(A, B, C) \