Merge tag 'md-3.10-fixes' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8192u / r8192U_wx.c

diff --git a/drivers/staging/rtl8192u/r8192U_wx.c b/drivers/staging/rtl8192u/r8192U_wx.c
index 71f2d2349c38610ad7641c533f1b871f8399fec7..c904aa8cc0a605028695c86b2c09ca9dbccd6b58 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_wx.c
+++ b/drivers/staging/rtl8192u/r8192U_wx.c
@@ -354,8 +354,7 @@ static int r8192_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
        return ret;
 }
 
-struct  iw_range_with_scan_capa
-{
+struct  iw_range_with_scan_capa {
        /* Informative stuff (to choose between different interface) */
        __u32           throughput;     /* To give an idea... */
        /* In theory this value should be the maximum benchmarked
@@ -711,12 +710,12 @@ static int r8192_wx_set_enc(struct net_device *dev,
                #define CONF_WEP104 0x14
 
                switch(wrqu->encoding.flags & IW_ENCODE_INDEX){
-                       case 0: key_idx = ieee->tx_keyidx; break;
-                       case 1: key_idx = 0; break;
-                       case 2: key_idx = 1; break;
-                       case 3: key_idx = 2; break;
-                       case 4: key_idx = 3; break;
-                       default: break;
+               case 0: key_idx = ieee->tx_keyidx; break;
+               case 1: key_idx = 0; break;
+               case 2: key_idx = 1; break;
+               case 3: key_idx = 2; break;
+               case 4: key_idx = 3; break;
+               default: break;
                }
 
                if(wrqu->encoding.length==0x5){
@@ -1021,7 +1020,7 @@ static int dummy(struct net_device *dev, struct iw_request_info *a,
 static iw_handler r8192_wx_handlers[] =
 {
        NULL,                     /* SIOCSIWCOMMIT */
-       r8192_wx_get_name,        /* SIOCGIWNAME */
+       r8192_wx_get_name,        /* SIOCGIWNAME */
        dummy,                    /* SIOCSIWNWID */
        dummy,                    /* SIOCGIWNWID */
        r8192_wx_set_freq,        /* SIOCSIWFREQ */
@@ -1040,7 +1039,7 @@ static iw_handler r8192_wx_handlers[] =
        dummy,                    /* SIOCGIWSPY */
        NULL,                     /* SIOCGIWTHRSPY */
        NULL,                     /* SIOCWIWTHRSPY */
-       r8192_wx_set_wap,         /* SIOCSIWAP */
+       r8192_wx_set_wap,         /* SIOCSIWAP */
        r8192_wx_get_wap,         /* SIOCGIWAP */
 #if (WIRELESS_EXT >= 18)
        r8192_wx_set_mlme,                     /* MLME-- */
@@ -1071,23 +1070,23 @@ static iw_handler r8192_wx_handlers[] =
        r8192_wx_set_power,                    /* SIOCSIWPOWER */
        r8192_wx_get_power,                    /* SIOCGIWPOWER */
        NULL,                   /*---hole---*/
-       NULL,                   /*---hole---*/
-       r8192_wx_set_gen_ie,//NULL,                     /* SIOCSIWGENIE */
-       NULL,                   /* SIOCSIWGENIE */
+       NULL,                   /*---hole---*/
+       r8192_wx_set_gen_ie,//NULL,                     /* SIOCSIWGENIE */
+       NULL,                   /* SIOCSIWGENIE */
 
 #if (WIRELESS_EXT >= 18)
-       r8192_wx_set_auth,//NULL,                       /* SIOCSIWAUTH */
-       NULL,//r8192_wx_get_auth,//NULL,                        /* SIOCSIWAUTH */
-       r8192_wx_set_enc_ext,                   /* SIOCSIWENCODEEXT */
-       NULL,//r8192_wx_get_enc_ext,//NULL,                     /* SIOCSIWENCODEEXT */
+       r8192_wx_set_auth,//NULL,                       /* SIOCSIWAUTH */
+       NULL,//r8192_wx_get_auth,//NULL,                        /* SIOCSIWAUTH */
+       r8192_wx_set_enc_ext,                   /* SIOCSIWENCODEEXT */
+       NULL,//r8192_wx_get_enc_ext,//NULL,                     /* SIOCSIWENCODEEXT */
 #else
        NULL,
        NULL,
        NULL,
        NULL,
 #endif
-       NULL,                   /* SIOCSIWPMKSA */
-       NULL,                    /*---hole---*/
+       NULL,                   /* SIOCSIWPMKSA */
+       NULL,                    /*---hole---*/
 
 };