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

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

diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index fda5707c4acda0f383fccc9b29f1c70cfa6e058d..86a88b493a43df2acb0de5661aca7a3f2b99c136 100644 (file)
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -171,7 +171,8 @@ struct NDIS_802_11_REMOVE_KEY {
 struct NDIS_802_11_WEP {
        u32 Length;               /* Length of this structure */
        u32 KeyIndex;             /* 0 is the per-client key,
-                                  * 1-N are the global keys */
+                                  * 1-N are the global keys
+                                  */
        u32 KeyLength;            /* length of key in bytes */
        u8  KeyMaterial[16];      /* variable length depending on above field */
 };
@@ -194,7 +195,8 @@ struct      wlan_network {
        struct list_head list;
        int     network_type;   /*refer to ieee80211.h for WIRELESS_11A/B/G */
        int     fixed;          /* set to fixed when not to be removed asi
-                                * site-surveying */
+                                * site-surveying
+                                */
        unsigned int    last_scanned; /*timestamp for the network */
        int     aid;            /*will only be valid when a BSS is joined. */
        int     join_res;