OSDN Git Service

staging/wilc1000: use NO_SECURITY instead of NO_ENCRYPT
authorArnd Bergmann <arnd@arndb.de>
Mon, 16 Nov 2015 14:04:56 +0000 (15:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:19:20 +0000 (14:19 -0800)
The linux_wlan.c file uses a set of enums from wilc_wlan_if.h,
with the exception of the NO_ENCRYPT that comes from
wilc_wfi_cfgoperations.h. The two sets of enums clearly have
the same intention but are defined a bit different.

To prepare to clean up the ones in wilc_wfi_cfgoperations.h, this
first changes over the only other user.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c

index f1e70b2..040caa0 100644 (file)
@@ -643,7 +643,7 @@ static int linux_wlan_init_test_config(struct net_device *dev, struct wilc *p_ni
        if (!wilc_wlan_cfg_set(0, WID_POWER_MANAGEMENT, c_val, 1, 0, 0))
                goto _fail_;
 
-       c_val[0] = NO_ENCRYPT;
+       c_val[0] = NO_SECURITY; /* NO_ENCRYPT, 0x79 */
        if (!wilc_wlan_cfg_set(0, WID_11I_MODE, c_val, 1, 0, 0))
                goto _fail_;