diff --git a/include/rtw_p2p.h b/include/rtw_p2p.h
index e0aaf04..a3e3adc 100644
--- a/include/rtw_p2p.h
+++ b/include/rtw_p2p.h
@@ -46,7 +46,7 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo,
 u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo,
 				     u8 *pframe, uint len);
 u8 process_p2p_group_negotation_confirm(struct wifidirect_info *pwdinfo,
-				        u8 *pframe, uint len);
+					u8 *pframe, uint len);
 u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe,
 			    uint len);
 void p2p_protocol_wk_hdl(struct adapter *padapter, int intcmdtype);
diff --git a/include/rtw_recv.h b/include/rtw_recv.h
index 9cfbfb2..fdb28f6 100644
--- a/include/rtw_recv.h
+++ b/include/rtw_recv.h
@@ -44,7 +44,7 @@ static u8 SNAP_ETH_TYPE_TDLS[2] = {0x89, 0x0d};
 static u8 SNAP_HDR_APPLETALK_DDP[3] = {0x08, 0x00, 0x07};
 
 static u8 oui_8021h[] = {0x00, 0x00, 0xf8};
-static u8 oui_rfc1042[] = {0x00,0x00,0x00};
+static u8 oui_rfc1042[] = {0x00, 0x00, 0x00};
 
 #define MAX_SUBFRAME_COUNT	64
 static u8 rtw_rfc1042_header[] = {
@@ -103,18 +103,18 @@ struct signal_stat {
 };
 #define MAX_PATH_NUM_92CS		2
 struct phy_info {
-	u8		RxPWDBAll;
-	u8		SignalQuality;	 /*  in 0-100 index. */
-	u8		RxMIMOSignalQuality[MAX_PATH_NUM_92CS]; /* EVM */
-	u8		RxMIMOSignalStrength[MAX_PATH_NUM_92CS];/*  in 0~100 index */
-	s8		RxPower; /*  in dBm Translate from PWdB */
+	u8	RxPWDBAll;
+	u8	SignalQuality;	 /*  in 0-100 index. */
+	u8	RxMIMOSignalQuality[MAX_PATH_NUM_92CS]; /* EVM */
+	u8	RxMIMOSignalStrength[MAX_PATH_NUM_92CS];/*  in 0~100 index */
+	s8	RxPower; /*  in dBm Translate from PWdB */
 /*  Real power in dBm for this packet, no beautification and aggregation.
  * Keep this raw info to be used for the other procedures. */
-	s8		recvpower;
-	u8		BTRxRSSIPercentage;
-	u8		SignalStrength; /*  in 0-100 index. */
-	u8		RxPwr[MAX_PATH_NUM_92CS];/* per-path's pwdb */
-	u8		RxSNR[MAX_PATH_NUM_92CS];/* per-path's SNR */
+	s8	recvpower;
+	u8	BTRxRSSIPercentage;
+	u8	SignalStrength; /*  in 0-100 index. */
+	u8	RxPwr[MAX_PATH_NUM_92CS];/* per-path's pwdb */
+	u8	RxSNR[MAX_PATH_NUM_92CS];/* per-path's SNR */
 };
 
 struct rx_pkt_attrib {
@@ -165,10 +165,8 @@ struct rx_pkt_attrib {
 
 
 /* These definition is used for Rx packet reordering. */
-#define SN_LESS(a, b)		(((a-b)&0x800)!=0)
+#define SN_LESS(a, b)		(((a - b) & 0x800) != 0)
 #define SN_EQUAL(a, b)	(a == b)
-/* define REORDER_WIN_SIZE	128 */
-/* define REORDER_ENTRY_NUM	128 */
 #define REORDER_WAIT_TIME	(50) /*  (ms) */
 
 #define RECVBUFF_ALIGN_SZ 8
@@ -317,21 +315,21 @@ union recv_frame {
 	} u;
 };
 
-union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue);
-union recv_frame *rtw_alloc_recvframe (struct __queue *pfree_recv_queue);
+union recv_frame *_rtw_alloc_recvframe(struct __queue *pfree_recv_queue);
+union recv_frame *rtw_alloc_recvframe(struct __queue *pfree_recv_queue);
 void rtw_init_recvframe(union recv_frame *precvframe,
-			       struct recv_priv *precvpriv);
+			struct recv_priv *precvpriv);
 int  rtw_free_recvframe(union recv_frame *precvframe,
-		        struct __queue *pfree_recv_queue);
+			struct __queue *pfree_recv_queue);
 #define rtw_dequeue_recvframe(queue) rtw_alloc_recvframe(queue)
 int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue);
 int rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue);
 void rtw_free_recvframe_queue(struct __queue *pframequeue,
 			      struct __queue *pfree_recv_queue);
 u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter);
-int rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queue);
+int rtw_enqueue_recvbuf_to_head(struct recv_buf *buf, struct __queue *queue);
 int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue);
-struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue);
+struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue);
 
 void rtw_reordering_ctrl_timeout_handler(void *pcontext);
 
@@ -369,11 +367,11 @@ static inline u8 *recvframe_push(union recv_frame *precvframe, int sz)
 	if (precvframe == NULL)
 		return NULL;
 	precvframe->u.hdr.rx_data -= sz ;
-	if ( precvframe->u.hdr.rx_data < precvframe->u.hdr.rx_head) {
-		precvframe->u.hdr.rx_data += sz ;
+	if (precvframe->u.hdr.rx_data < precvframe->u.hdr.rx_head) {
+		precvframe->u.hdr.rx_data += sz;
 		return NULL;
 	}
-	precvframe->u.hdr.len +=sz;
+	precvframe->u.hdr.len += sz;
 	return precvframe->u.hdr.rx_data;
 }
 
@@ -410,7 +408,7 @@ static inline u8 *recvframe_put(union recv_frame *precvframe, int sz)
 		precvframe->u.hdr.rx_tail -= sz;
 		return NULL;
 	}
-	precvframe->u.hdr.len +=sz;
+	precvframe->u.hdr.len += sz;
 	return precvframe->u.hdr.rx_tail;
 }
 
@@ -444,7 +442,8 @@ static inline unsigned char *get_rxbuf_desc(union recv_frame *precvframe)
 
 static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem)
 {
-	/* due to the design of 2048 bytes alignment of recv_frame, we can reference the union recv_frame */
+	/* due to the design of 2048 bytes alignment of recv_frame,
+	 * we can reference the union recv_frame */
 	/* from any given member of recv_frame. */
 	/*  rxmem indicates the any member/address in recv_frame */
 
@@ -473,7 +472,7 @@ static inline u8 *pkt_to_recvdata(struct sk_buff *pkt)
 {
 	/*  return the rx_data */
 
-	union recv_frame *precv_frame =pkt_to_recvframe(pkt);
+	union recv_frame *precv_frame = pkt_to_recvframe(pkt);
 
 	return	precv_frame->u.hdr.rx_data;
 }
diff --git a/include/rtw_rf.h b/include/rtw_rf.h
index 659182c..c41125d 100644
--- a/include/rtw_rf.h
+++ b/include/rtw_rf.h
@@ -90,7 +90,7 @@ enum	_REG_PREAMBLE_MODE {
 	PREAMBLE_SHORT	= 3,
 };
 
-enum _RTL8712_RF_MIMO_CONFIG_{
+enum _RTL8712_RF_MIMO_CONFIG_ {
 	RTL8712_RFCONFIG_1T = 0x10,
 	RTL8712_RFCONFIG_2T = 0x20,
 	RTL8712_RFCONFIG_1R = 0x01,
diff --git a/include/rtw_security.h b/include/rtw_security.h
index 9c0b764..ce99128 100644
--- a/include/rtw_security.h
+++ b/include/rtw_security.h
@@ -90,8 +90,8 @@ union pn48	{
 };
 
 union Keytype {
-        u8   skey[16];
-        u32    lkey[4];
+	u8   skey[16];
+	u32    lkey[4];
 };
 
 struct rt_pmkid_list {
@@ -99,7 +99,7 @@ struct rt_pmkid_list {
 	u8	Bssid[6];
 	u8	PMKID[16];
 	u8	SsidBuf[33];
-	u8*	ssid_octet;
+	u8	*ssid_octet;
 	u16	ssid_length;
 };
 
@@ -175,62 +175,62 @@ struct sha256_state {
 	u8 buf[64];
 };
 
-#define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)\
-do {\
-	switch (psecuritypriv->dot11AuthAlgrthm) {\
-		case dot11AuthAlgrthm_Open:\
-		case dot11AuthAlgrthm_Shared:\
-		case dot11AuthAlgrthm_Auto:\
-			encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
-			break;\
-		case dot11AuthAlgrthm_8021X:\
-			if (bmcst)\
-				encry_algo = (u8)psecuritypriv->dot118021XGrpPrivacy;\
-			else\
-				encry_algo =(u8) psta->dot118021XPrivacy;\
-			break;\
-	     case dot11AuthAlgrthm_WAPI:\
-		     encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;\
-		     break;\
-	}\
+#define GET_ENCRY_ALGO(psecuritypriv, psta, encry_algo, bmcst)		\
+do {									\
+	switch (psecuritypriv->dot11AuthAlgrthm) {			\
+	case dot11AuthAlgrthm_Open:					\
+	case dot11AuthAlgrthm_Shared:					\
+	case dot11AuthAlgrthm_Auto:					\
+		encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;	\
+		break;							\
+	case dot11AuthAlgrthm_8021X:					\
+		if (bmcst)						\
+			encry_algo = (u8)psecuritypriv->dot118021XGrpPrivacy;\
+		else							\
+			encry_algo = (u8)psta->dot118021XPrivacy;	\
+		break;							\
+	case dot11AuthAlgrthm_WAPI:					\
+		encry_algo = (u8)psecuritypriv->dot11PrivacyAlgrthm;	\
+		break;							\
+	}								\
 } while (0)
 
-#define SET_ICE_IV_LEN(iv_len, icv_len, encrypt)\
-do {\
-	switch (encrypt) {\
-		case _WEP40_:\
-		case _WEP104_:\
-			iv_len = 4;\
-			icv_len = 4;\
-			break;\
-		case _TKIP_:\
-			iv_len = 8;\
-			icv_len = 4;\
-			break;\
-		case _AES_:\
-			iv_len = 8;\
-			icv_len = 8;\
-			break;\
-		case _SMS4_:\
-			iv_len = 18;\
-			icv_len = 16;\
-			break;\
-		default:\
-			iv_len = 0;\
-			icv_len = 0;\
-			break;\
-	}\
+#define SET_ICE_IV_LEN(iv_len, icv_len, encrypt)			\
+do {									\
+	switch (encrypt) {						\
+	case _WEP40_:							\
+	case _WEP104_:							\
+		iv_len = 4;						\
+		icv_len = 4;						\
+		break;							\
+	case _TKIP_:							\
+		iv_len = 8;						\
+		icv_len = 4;						\
+		break;							\
+	case _AES_:							\
+		iv_len = 8;						\
+		icv_len = 8;						\
+		break;							\
+	case _SMS4_:							\
+		iv_len = 18;						\
+		icv_len = 16;						\
+		break;							\
+	default:							\
+		iv_len = 0;						\
+		icv_len = 0;						\
+		break;							\
+	}								\
 } while (0)
 
 
-#define GET_TKIP_PN(iv,dot11txpn)\
-do {\
-	dot11txpn._byte_.TSC0=iv[2];\
-	dot11txpn._byte_.TSC1=iv[0];\
-	dot11txpn._byte_.TSC2=iv[4];\
-	dot11txpn._byte_.TSC3=iv[5];\
-	dot11txpn._byte_.TSC4=iv[6];\
-	dot11txpn._byte_.TSC5=iv[7];\
+#define GET_TKIP_PN(iv, dot11txpn)					\
+do {									\
+	dot11txpn._byte_.TSC0 = iv[2];					\
+	dot11txpn._byte_.TSC1 = iv[0];					\
+	dot11txpn._byte_.TSC2 = iv[4];					\
+	dot11txpn._byte_.TSC3 = iv[5];					\
+	dot11txpn._byte_.TSC4 = iv[6];					\
+	dot11txpn._byte_.TSC5 = iv[7];					\
 } while (0)
 
 
@@ -241,7 +241,7 @@ struct mic_data {
 	u32  K0, K1;         /*  Key */
 	u32  L, R;           /*  Current state */
 	u32  M;              /*  Message accumulator (single word) */
-	u32     nBytesInM;      /*  # bytes in M */
+	u32  nBytesInM;      /*  # bytes in M */
 };
 
 extern const u32 Te0[256];
@@ -352,10 +352,10 @@ static const unsigned long K[64] = {
 
 /* Various logical functions */
 #define RORc(x, y) \
-(((((unsigned long) (x) & 0xFFFFFFFFUL) >> (unsigned long) ((y) & 31)) | \
- ((unsigned long) (x) << (unsigned long) (32 - ((y) & 31)))) & 0xFFFFFFFFUL)
-#define Ch(x,y,z)       (z ^ (x & (y ^ z)))
-#define Maj(x,y,z)      (((x | y) & z) | (x & y))
+	(((((unsigned long)(x) & 0xFFFFFFFFUL) >> (unsigned long)((y)&31)) | \
+	 ((unsigned long)(x) << (unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
+#define Ch(x, y ,z)       (z ^ (x & (y ^ z)))
+#define Maj(x, y, z)      (((x | y) & z) | (x & y))
 #define S(x, n)         RORc((x), (n))
 #define R(x, n)         (((x)&0xFFFFFFFFUL)>>(n))
 #define Sigma0(x)       (S(x, 2) ^ S(x, 13) ^ S(x, 22))
diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h
index a54d925..be736e7 100644
--- a/include/rtw_xmit.h
+++ b/include/rtw_xmit.h
@@ -345,7 +345,7 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter,
 				     struct sta_info *psta, int up, u8 *ac);
 s32 rtw_xmitframe_enqueue(struct adapter *padapter,
 			  struct xmit_frame *pxmitframe);
-struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv,
+struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv,
 				      struct hw_xmit *phwxmit_i, int entry);
 
 s32 rtw_xmit_classifier(struct adapter *padapter,
diff --git a/include/sta_info.h b/include/sta_info.h
index 8c79769..0b4b4fd 100644
--- a/include/sta_info.h
+++ b/include/sta_info.h
@@ -380,7 +380,7 @@ extern struct sta_info *rtw_alloc_stainfo(struct sta_priv *stapriv, u8 *hwaddr);
 extern u32	rtw_free_stainfo(struct adapter *adapt, struct sta_info *psta);
 extern void rtw_free_all_stainfo(struct adapter *adapt);
 extern struct sta_info *rtw_get_stainfo(struct sta_priv *stapriv, u8 *hwaddr);
-extern u32 rtw_init_bcmc_stainfo(struct adapter* adapt);
+extern u32 rtw_init_bcmc_stainfo(struct adapter *adapt);
 extern struct sta_info *rtw_get_bcmc_stainfo(struct adapter *padapter);
 extern u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr);
 
diff --git a/include/usb_ops.h b/include/usb_ops.h
index cdf8ea0..c23de7b 100644
--- a/include/usb_ops.h
+++ b/include/usb_ops.h
@@ -35,9 +35,9 @@ enum{
 };
 #define ALIGNMENT_UNIT			16
 #define MAX_VENDOR_REQ_CMD_SIZE	254	/* 8188cu SIE Support */
-#define MAX_USB_IO_CTL_SIZE		(MAX_VENDOR_REQ_CMD_SIZE +ALIGNMENT_UNIT)
+#define MAX_USB_IO_CTL_SIZE	(MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT)
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 #define rtw_usb_control_msg(dev, pipe, request, requesttype,		\
 			    value, index, data, size, timeout_ms)	\
 	usb_control_msg((dev), (pipe), (request), (requesttype), (value),\
@@ -47,7 +47,7 @@ enum{
 		     (actual_length), (timeout_ms))
 #else
 #define rtw_usb_control_msg(dev, pipe, request, requesttype,		\
-			    value, index, data, size,timeout_ms)	\
+			    value, index, data, size, timeout_ms)	\
 	usb_control_msg((dev), (pipe), (request), (requesttype),	\
 			(value), (index), (data), (size),		\
 			((timeout_ms) == 0) ||				\
@@ -56,7 +56,7 @@ enum{
 #define rtw_usb_bulk_msg(usb_dev, pipe, data, len,			\
 			 actual_length, timeout_ms) \
 	usb_bulk_msg((usb_dev), (pipe), (data), (len), (actual_length), \
-		     ((timeout_ms) == 0) | |((timeout_ms)*HZ/1000 > 0) ?\
+		     ((timeout_ms) == 0) || ((timeout_ms)*HZ/1000 > 0) ?\
 		     ((timeout_ms)*HZ/1000) : 1)
 #endif
 #include <usb_ops_linux.h>
diff --git a/include/wifi.h b/include/wifi.h
index 81dd96b..a615659 100644
--- a/include/wifi.h
+++ b/include/wifi.h
@@ -64,39 +64,39 @@ enum WIFI_FRAME_TYPE {
 };
 
 enum WIFI_FRAME_SUBTYPE {
-    /*  below is for mgt frame */
-    WIFI_ASSOCREQ       = (0 | WIFI_MGT_TYPE),
-    WIFI_ASSOCRSP       = (BIT(4) | WIFI_MGT_TYPE),
-    WIFI_REASSOCREQ     = (BIT(5) | WIFI_MGT_TYPE),
-    WIFI_REASSOCRSP     = (BIT(5) | BIT(4) | WIFI_MGT_TYPE),
-    WIFI_PROBEREQ       = (BIT(6) | WIFI_MGT_TYPE),
-    WIFI_PROBERSP       = (BIT(6) | BIT(4) | WIFI_MGT_TYPE),
-    WIFI_BEACON         = (BIT(7) | WIFI_MGT_TYPE),
-    WIFI_ATIM           = (BIT(7) | BIT(4) | WIFI_MGT_TYPE),
-    WIFI_DISASSOC       = (BIT(7) | BIT(5) | WIFI_MGT_TYPE),
-    WIFI_AUTH           = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE),
-    WIFI_DEAUTH         = (BIT(7) | BIT(6) | WIFI_MGT_TYPE),
-    WIFI_ACTION         = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE),
+	/*  below is for mgt frame */
+	WIFI_ASSOCREQ       = (0 | WIFI_MGT_TYPE),
+	WIFI_ASSOCRSP       = (BIT(4) | WIFI_MGT_TYPE),
+	WIFI_REASSOCREQ     = (BIT(5) | WIFI_MGT_TYPE),
+	WIFI_REASSOCRSP     = (BIT(5) | BIT(4) | WIFI_MGT_TYPE),
+	WIFI_PROBEREQ       = (BIT(6) | WIFI_MGT_TYPE),
+	WIFI_PROBERSP       = (BIT(6) | BIT(4) | WIFI_MGT_TYPE),
+	WIFI_BEACON         = (BIT(7) | WIFI_MGT_TYPE),
+	WIFI_ATIM           = (BIT(7) | BIT(4) | WIFI_MGT_TYPE),
+	WIFI_DISASSOC       = (BIT(7) | BIT(5) | WIFI_MGT_TYPE),
+	WIFI_AUTH           = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE),
+	WIFI_DEAUTH         = (BIT(7) | BIT(6) | WIFI_MGT_TYPE),
+	WIFI_ACTION         = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE),
 
-    /*  below is for control frame */
-    WIFI_PSPOLL         = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE),
-    WIFI_RTS            = (BIT(7) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE),
-    WIFI_CTS            = (BIT(7) | BIT(6) | WIFI_CTRL_TYPE),
-    WIFI_ACK            = (BIT(7) | BIT(6) | BIT(4) | WIFI_CTRL_TYPE),
-    WIFI_CFEND          = (BIT(7) | BIT(6) | BIT(5) | WIFI_CTRL_TYPE),
-    WIFI_CFEND_CFACK    = (BIT(7) | BIT(6) | BIT(5) | BIT(4) |
-			   WIFI_CTRL_TYPE),
+	/*  below is for control frame */
+	WIFI_PSPOLL         = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE),
+	WIFI_RTS            = (BIT(7) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE),
+	WIFI_CTS            = (BIT(7) | BIT(6) | WIFI_CTRL_TYPE),
+	WIFI_ACK            = (BIT(7) | BIT(6) | BIT(4) | WIFI_CTRL_TYPE),
+	WIFI_CFEND          = (BIT(7) | BIT(6) | BIT(5) | WIFI_CTRL_TYPE),
+	WIFI_CFEND_CFACK    = (BIT(7) | BIT(6) | BIT(5) | BIT(4) |
+	WIFI_CTRL_TYPE),
 
-    /*  below is for data frame */
-    WIFI_DATA           = (0 | WIFI_DATA_TYPE),
-    WIFI_DATA_CFACK     = (BIT(4) | WIFI_DATA_TYPE),
-    WIFI_DATA_CFPOLL    = (BIT(5) | WIFI_DATA_TYPE),
-    WIFI_DATA_CFACKPOLL = (BIT(5) | BIT(4) | WIFI_DATA_TYPE),
-    WIFI_DATA_NULL      = (BIT(6) | WIFI_DATA_TYPE),
-    WIFI_CF_ACK         = (BIT(6) | BIT(4) | WIFI_DATA_TYPE),
-    WIFI_CF_POLL        = (BIT(6) | BIT(5) | WIFI_DATA_TYPE),
-    WIFI_CF_ACKPOLL     = (BIT(6) | BIT(5) | BIT(4) | WIFI_DATA_TYPE),
-    WIFI_QOS_DATA_NULL	= (BIT(6) | WIFI_QOS_DATA_TYPE),
+	/*  below is for data frame */
+	WIFI_DATA           = (0 | WIFI_DATA_TYPE),
+	WIFI_DATA_CFACK     = (BIT(4) | WIFI_DATA_TYPE),
+	WIFI_DATA_CFPOLL    = (BIT(5) | WIFI_DATA_TYPE),
+	WIFI_DATA_CFACKPOLL = (BIT(5) | BIT(4) | WIFI_DATA_TYPE),
+	WIFI_DATA_NULL      = (BIT(6) | WIFI_DATA_TYPE),
+	WIFI_CF_ACK         = (BIT(6) | BIT(4) | WIFI_DATA_TYPE),
+	WIFI_CF_POLL        = (BIT(6) | BIT(5) | WIFI_DATA_TYPE),
+	WIFI_CF_ACKPOLL     = (BIT(6) | BIT(5) | BIT(4) | WIFI_DATA_TYPE),
+	WIFI_QOS_DATA_NULL	= (BIT(6) | WIFI_QOS_DATA_TYPE),
 };
 
 enum WIFI_REASON_CODE	{
@@ -245,92 +245,64 @@ enum WIFI_REG_DOMAIN {
 #define _ORDER_		BIT(15)
 
 #define SetToDs(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16(_TO_DS_); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16(_TO_DS_)
 
 #define GetToDs(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_TO_DS_)) != 0)
 
 #define ClearToDs(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) &= (~cpu_to_le16(_TO_DS_)); \
-	} while (0)
+	*(__le16 *)(pbuf) &= (~cpu_to_le16(_TO_DS_))
 
 #define SetFrDs(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16(_FROM_DS_); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16(_FROM_DS_)
 
 #define GetFrDs(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_FROM_DS_)) != 0)
 
 #define ClearFrDs(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) &= (~cpu_to_le16(_FROM_DS_)); \
-	} while (0)
+	*(__le16 *)(pbuf) &= (~cpu_to_le16(_FROM_DS_))
 
 #define get_tofr_ds(pframe)	((GetToDs(pframe) << 1) | GetFrDs(pframe))
 
 
 #define SetMFrag(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_FRAG_); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_FRAG_)
 
 #define GetMFrag(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_MORE_FRAG_)) != 0)
 
 #define ClearMFrag(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_FRAG_)); \
-	} while (0)
+	*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_FRAG_))
 
 #define SetRetry(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16(_RETRY_); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16(_RETRY_)
 
 #define GetRetry(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_RETRY_)) != 0)
 
 #define ClearRetry(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) &= (~cpu_to_le16(_RETRY_)); \
-	} while (0)
+	*(__le16 *)(pbuf) &= (~cpu_to_le16(_RETRY_))
 
 #define SetPwrMgt(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16(_PWRMGT_); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16(_PWRMGT_)
 
 #define GetPwrMgt(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_PWRMGT_)) != 0)
 
 #define ClearPwrMgt(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) &= (~cpu_to_le16(_PWRMGT_)); \
-	} while (0)
+	*(__le16 *)(pbuf) &= (~cpu_to_le16(_PWRMGT_))
 
 #define SetMData(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_DATA_); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16(_MORE_DATA_)
 
 #define GetMData(pbuf)	(((*(__le16 *)(pbuf)) & cpu_to_le16(_MORE_DATA_)) != 0)
 
 #define ClearMData(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_DATA_)); \
-	} while (0)
+	*(__le16 *)(pbuf) &= (~cpu_to_le16(_MORE_DATA_))
 
 #define SetPrivacy(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16(_PRIVACY_); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16(_PRIVACY_)
 
 #define GetPrivacy(pbuf)					\
 	(((*(__le16 *)(pbuf)) & cpu_to_le16(_PRIVACY_)) != 0)
 
 #define ClearPrivacy(pbuf)	\
-	do	{	\
-		*(__le16 *)(pbuf) &= (~cpu_to_le16(_PRIVACY_)); \
-	} while (0)
+	*(__le16 *)(pbuf) &= (~cpu_to_le16(_PRIVACY_))
 
 
 #define GetOrder(pbuf)					\
@@ -339,16 +311,16 @@ enum WIFI_REG_DOMAIN {
 #define GetFrameType(pbuf)				\
 	(le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(3) | BIT(2)))
 
-#define SetFrameType(pbuf,type)	\
+#define SetFrameType(pbuf, type)	\
 	do {	\
 		*(unsigned short *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \
 		*(unsigned short *)(pbuf) |= __constant_cpu_to_le16(type); \
 	} while (0)
 
-#define GetFrameSubType(pbuf)	(le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(7) |	\
+#define GetFrameSubType(pbuf)	(le16_to_cpu(*(__le16 *)(pbuf)) & (BIT(7) |\
 	 BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2)))
 
-#define SetFrameSubType(pbuf,type) \
+#define SetFrameSubType(pbuf, type) \
 	do {    \
 		*(__le16 *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) |	\
 		 BIT(5) | BIT(4) | BIT(3) | BIT(2))); \
@@ -380,36 +352,26 @@ enum WIFI_REG_DOMAIN {
 	} while (0)
 
 #define SetDuration(pbuf, dur) \
-	do {    \
-		*(__le16 *)((size_t)(pbuf) + 2) = cpu_to_le16(0xffff & (dur)); \
-	} while (0)
+	*(__le16 *)((size_t)(pbuf) + 2) = cpu_to_le16(0xffff & (dur))
 
 
 #define SetPriority(pbuf, tid)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16(tid & 0xf); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16(tid & 0xf)
 
 #define GetPriority(pbuf)	((le16_to_cpu(*(__le16 *)(pbuf))) & 0xf)
 
 #define SetEOSP(pbuf, eosp)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16( (eosp & 1) << 4); \
-	} while (0)
+		*(__le16 *)(pbuf) |= cpu_to_le16((eosp & 1) << 4)
 
 #define SetAckpolicy(pbuf, ack)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16( (ack & 3) << 5); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16((ack & 3) << 5)
 
 #define GetAckpolicy(pbuf) (((le16_to_cpu(*(__le16 *)pbuf)) >> 5) & 0x3)
 
 #define GetAMsdu(pbuf) (((le16_to_cpu(*(__le16 *)pbuf)) >> 7) & 0x1)
 
 #define SetAMsdu(pbuf, amsdu)	\
-	do	{	\
-		*(__le16 *)(pbuf) |= cpu_to_le16( (amsdu & 1) << 7); \
-	} while (0)
+	*(__le16 *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7)
 
 #define GetAid(pbuf)	(le16_to_cpu(*(__le16 *)((size_t)(pbuf) + 2)) & 0x3fff)
 
@@ -503,14 +465,12 @@ static inline unsigned char *get_hdr_bssid(unsigned char *pframe)
 		sa = GetAddr1Ptr(pframe);
 		break;
 	default:
-		sa =NULL; /*  */
+		sa = NULL; /*  */
 		break;
 	}
-
 	return sa;
 }
 
-
 static inline int IsFrameTypeCtrl(unsigned char *pframe)
 {
 	if (WIFI_CTRL_TYPE == GetFrameType(pframe))
@@ -828,10 +788,10 @@ enum ht_cap_ampdu_factor {
 #define HT_INFO_STBC_PARAM_PCO_ACTIVE		((u16) BIT(10))
 #define HT_INFO_STBC_PARAM_PCO_PHASE		((u16) BIT(11))
 
-/* 	===============WPS Section=============== */
-/* 	For WPSv1.0 */
+/*	===============WPS Section=============== */
+/*	For WPSv1.0 */
 #define WPSOUI					0x0050f204
-/* 	WPS attribute ID */
+/*	WPS attribute ID */
 #define WPS_ATTR_VER1				0x104A
 #define WPS_ATTR_SIMPLE_CONF_STATE		0x1044
 #define WPS_ATTR_RESP_TYPE			0x103B
@@ -852,29 +812,29 @@ enum ht_cap_ampdu_factor {
 #define WPS_ATTR_VENDOR_EXT			0x1049
 #define WPS_ATTR_SELECTED_REGISTRAR		0x1041
 
-/* 	Value of WPS attribute "WPS_ATTR_DEVICE_NAME */
+/*	Value of WPS attribute "WPS_ATTR_DEVICE_NAME */
 #define WPS_MAX_DEVICE_NAME_LEN			32
 
-/* 	Value of WPS Request Type Attribute */
+/*	Value of WPS Request Type Attribute */
 #define WPS_REQ_TYPE_ENROLLEE_INFO_ONLY		0x00
 #define WPS_REQ_TYPE_ENROLLEE_OPEN_8021X	0x01
 #define WPS_REQ_TYPE_REGISTRAR			0x02
 #define WPS_REQ_TYPE_WLAN_MANAGER_REGISTRAR	0x03
 
-/* 	Value of WPS Response Type Attribute */
+/*	Value of WPS Response Type Attribute */
 #define WPS_RESPONSE_TYPE_INFO_ONLY	0x00
 #define WPS_RESPONSE_TYPE_8021X		0x01
 #define WPS_RESPONSE_TYPE_REGISTRAR	0x02
 #define WPS_RESPONSE_TYPE_AP		0x03
 
-/* 	Value of WPS WiFi Simple Configuration State Attribute */
+/*	Value of WPS WiFi Simple Configuration State Attribute */
 #define WPS_WSC_STATE_NOT_CONFIG	0x01
 #define WPS_WSC_STATE_CONFIG		0x02
 
-/* 	Value of WPS Version Attribute */
+/*	Value of WPS Version Attribute */
 #define WPS_VERSION_1			0x10
 
-/* 	Value of WPS Configuration Method Attribute */
+/*	Value of WPS Configuration Method Attribute */
 #define WPS_CONFIG_METHOD_FLASH		0x0001
 #define WPS_CONFIG_METHOD_ETHERNET	0x0002
 #define WPS_CONFIG_METHOD_LABEL		0x0004
@@ -889,16 +849,16 @@ enum ht_cap_ampdu_factor {
 #define WPS_CONFIG_METHOD_VDISPLAY	0x2008
 #define WPS_CONFIG_METHOD_PDISPLAY	0x4008
 
-/* 	Value of Category ID of WPS Primary Device Type Attribute */
+/*	Value of Category ID of WPS Primary Device Type Attribute */
 #define WPS_PDT_CID_DISPLAYS		0x0007
 #define WPS_PDT_CID_MULIT_MEDIA		0x0008
 #define WPS_PDT_CID_RTK_WIDI		WPS_PDT_CID_MULIT_MEDIA
 
-/* 	Value of Sub Category ID of WPS Primary Device Type Attribute */
+/*	Value of Sub Category ID of WPS Primary Device Type Attribute */
 #define WPS_PDT_SCID_MEDIA_SERVER	0x0005
 #define WPS_PDT_SCID_RTK_DMP		WPS_PDT_SCID_MEDIA_SERVER
 
-/* 	Value of Device Password ID */
+/*	Value of Device Password ID */
 #define WPS_DPID_P			0x0000
 #define WPS_DPID_USER_SPEC		0x0001
 #define WPS_DPID_MACHINE_SPEC		0x0002
@@ -906,22 +866,22 @@ enum ht_cap_ampdu_factor {
 #define WPS_DPID_PBC			0x0004
 #define WPS_DPID_REGISTRAR_SPEC		0x0005
 
-/* 	Value of WPS RF Bands Attribute */
+/*	Value of WPS RF Bands Attribute */
 #define WPS_RF_BANDS_2_4_GHZ		0x01
 #define WPS_RF_BANDS_5_GHZ		0x02
 
-/* 	Value of WPS Association State Attribute */
+/*	Value of WPS Association State Attribute */
 #define WPS_ASSOC_STATE_NOT_ASSOCIATED		0x00
 #define WPS_ASSOC_STATE_CONNECTION_SUCCESS	0x01
 #define WPS_ASSOC_STATE_CONFIGURATION_FAILURE	0x02
 #define WPS_ASSOC_STATE_ASSOCIATION_FAILURE	0x03
 #define WPS_ASSOC_STATE_IP_FAILURE		0x04
 
-/* 	=====================P2P Section===================== */
-/* 	For P2P */
+/*	=====================P2P Section===================== */
+/*	For P2P */
 #define	P2POUI					0x506F9A09
 
-/* 	P2P Attribute ID */
+/*	P2P Attribute ID */
 #define	P2P_ATTR_STATUS				0x00
 #define	P2P_ATTR_MINOR_REASON_CODE		0x01
 #define	P2P_ATTR_CAPABILITY			0x02
@@ -942,7 +902,7 @@ enum ht_cap_ampdu_factor {
 #define	P2P_ATTR_OPERATING_CH			0x11
 #define	P2P_ATTR_INVITATION_FLAGS		0x12
 
-/* 	Value of Status Attribute */
+/*	Value of Status Attribute */
 #define	P2P_STATUS_SUCCESS				0x00
 #define	P2P_STATUS_FAIL_INFO_UNAVAILABLE		0x01
 #define	P2P_STATUS_FAIL_INCOMPATIBLE_PARAM		0x02
@@ -956,7 +916,7 @@ enum ht_cap_ampdu_factor {
 #define	P2P_STATUS_FAIL_INCOMPATIBLE_PROVSION		0x0A
 #define	P2P_STATUS_FAIL_USER_REJECT			0x0B
 
-/* 	Value of Inviation Flags Attribute */
+/*	Value of Inviation Flags Attribute */
 #define	P2P_INVITATION_FLAGS_PERSISTENT			BIT(0)
 
 #define	DMP_P2P_DEVCAP_SUPPORT	(P2P_DEVCAP_SERVICE_DISCOVERY | \
@@ -966,7 +926,7 @@ enum ht_cap_ampdu_factor {
 
 #define	DMP_P2P_GRPCAP_SUPPORT	(P2P_GRPCAP_INTRABSS)
 
-/* 	Value of Device Capability Bitmap */
+/*	Value of Device Capability Bitmap */
 #define	P2P_DEVCAP_SERVICE_DISCOVERY		BIT(0)
 #define	P2P_DEVCAP_CLIENT_DISCOVERABILITY	BIT(1)
 #define	P2P_DEVCAP_CONCURRENT_OPERATION		BIT(2)
@@ -974,7 +934,7 @@ enum ht_cap_ampdu_factor {
 #define	P2P_DEVCAP_DEVICE_LIMIT			BIT(4)
 #define	P2P_DEVCAP_INVITATION_PROC		BIT(5)
 
-/* 	Value of Group Capability Bitmap */
+/*	Value of Group Capability Bitmap */
 #define	P2P_GRPCAP_GO				BIT(0)
 #define	P2P_GRPCAP_PERSISTENT_GROUP		BIT(1)
 #define	P2P_GRPCAP_GROUP_LIMIT			BIT(2)
@@ -983,10 +943,10 @@ enum ht_cap_ampdu_factor {
 #define	P2P_GRPCAP_PERSISTENT_RECONN		BIT(5)
 #define	P2P_GRPCAP_GROUP_FORMATION		BIT(6)
 
-/* 	P2P Public Action Frame ( Management Frame ) */
+/*	P2P Public Action Frame (Management Frame) */
 #define	P2P_PUB_ACTION_ACTION			0x09
 
-/* 	P2P Public Action Frame Type */
+/*	P2P Public Action Frame Type */
 #define	P2P_GO_NEGO_REQ				0
 #define	P2P_GO_NEGO_RESP			1
 #define	P2P_GO_NEGO_CONF			2
@@ -997,7 +957,7 @@ enum ht_cap_ampdu_factor {
 #define	P2P_PROVISION_DISC_REQ			7
 #define	P2P_PROVISION_DISC_RESP			8
 
-/* 	P2P Action Frame Type */
+/*	P2P Action Frame Type */
 #define	P2P_NOTICE_OF_ABSENCE			0
 #define	P2P_PRESENCE_REQUEST			1
 #define	P2P_PRESENCE_RESPONSE			2
@@ -1034,13 +994,13 @@ enum ht_cap_ampdu_factor {
 #define	P2P_INVITE_TIMEOUT		5000
 /* 3 seconds timeout for sending the invitation request under concurrent mode */
 #define	P2P_CONCURRENT_INVITE_TIME	3000
-/* 25 seconds timeout to reset the scan channel ( based on channel plan ) */
+/* 25 seconds timeout to reset the scan channel (based on channel plan) */
 #define	P2P_RESET_SCAN_CH		25000
 #define	P2P_MAX_INTENT			15
 
 #define	P2P_MAX_NOA_NUM			2
 
-/* 	WPS Configuration Method */
+/*	WPS Configuration Method */
 #define	WPS_CM_NONE			0x0000
 #define	WPS_CM_LABEL			0x0004
 #define	WPS_CM_DISPLYA			0x0008
@@ -1139,8 +1099,8 @@ enum P2P_PS_MODE {
 	P2P_PS_MIX = 3, /*  CTWindow and NoA */
 };
 
-/* 	=====================WFD Section===================== */
-/* 	For Wi-Fi Display */
+/*	=====================WFD Section===================== */
+/*	For Wi-Fi Display */
 #define	WFD_ATTR_DEVICE_INFO		0x00
 #define	WFD_ATTR_ASSOC_BSSID		0x01
 #define	WFD_ATTR_COUPLED_SINK_INFO	0x06
@@ -1148,7 +1108,7 @@ enum P2P_PS_MODE {
 #define	WFD_ATTR_SESSION_INFO		0x09
 #define	WFD_ATTR_ALTER_MAC		0x0a
 
-/* 	For WFD Device Information Attribute */
+/*	For WFD Device Information Attribute */
 #define	WFD_DEVINFO_SOURCE			0x0000
 #define	WFD_DEVINFO_PSINK			0x0001
 #define	WFD_DEVINFO_SSINK			0x0002