Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8712 / rtl871x_mlme.h

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.h b/drivers/staging/rtl8712/rtl871x_mlme.h
index 61e0eb745d21f6c18553d43f6804809959ff3b8c..ddaaab058b2f020ca03f61d6c0454e8b74505f36 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.h
+++ b/drivers/staging/rtl8712/rtl871x_mlme.h
@@ -47,16 +47,20 @@
 #define   WIFI_ADHOC_MASTER_STATE 0x00000040
 #define   WIFI_UNDER_LINKING   0x00000080
 #define WIFI_SITE_MONITOR      0x00000800      /* to indicate the station
-                                                * is under site surveying*/
+                                                * is under site surveying
+                                                */
 #define        WIFI_MP_STATE           0x00010000
 #define        WIFI_MP_CTX_BACKGROUND  0x00020000      /* in cont. tx background*/
 #define        WIFI_MP_CTX_ST          0x00040000      /* in cont. tx with
-                                                *  single-tone*/
+                                                * single-tone
+                                                */
 #define        WIFI_MP_CTX_BACKGROUND_PENDING  0x00080000 /* pending in cont, tx
-                                       * background due to out of skb*/
+                                                   * background due to out of skb
+                                                   */
 #define        WIFI_MP_CTX_CCK_HW      0x00100000      /* in continuous tx*/
 #define        WIFI_MP_CTX_CCK_CS      0x00200000      /* in cont, tx with carrier
-                                                * suppression*/
+                                                * suppression
+                                                */
 #define   WIFI_MP_LPBK_STATE   0x00400000
 
 #define _FW_UNDER_LINKING      WIFI_UNDER_LINKING