Path: csiph.com!xmission!news.glorb.com!bofh.it!news.nic.it!robomod From: Arnd Bergmann Newsgroups: linux.kernel Subject: [PATCH 05/19] staging/wilc1000: use NO_SECURITY instead of NO_ENCRYPT Date: Wed, 21 Oct 2015 01:00:02 +0200 Message-ID: References: X-Original-To: linux-wireless@vger.kernel.org X-Mailer: git-send-email 2.1.0.rc2 X-Provags-ID: V03:K0:ll3wVHJNyJcYudczM+0H42RuDbn+w782qQ/36anVTTzSO872NP5 FGaZm2so35I88e+KrL/vFbKu/EAuer0X4Q2UHpYeZZcFkM9+MOOm7n4csbtNzRbS+y31nJi L1dNL8UcAagvWJFN5BM9Cw115sfHbXbRqu9PbJJIxJws7OX6gC2Y36tvARSLItjbwkCAGqT siz53sNq+9H9WyH52j/0Q== X-Ui-Out-Filterresults: notjunk:1;V01:K0:JAcLdC/iVKI=:g0pGb7X1Rr5AlVRGpy1a+G AWwpbd+XMEitqmg8zRoUacvFuxAHRC7ln1uk99SYTNLL3G24VErziGuuYM6bY1WPZcyaGGr3A cnmKiWb2ATRll0GWgBNATYXcskw6JKDkXJ4jibMJNiFLMzj4retyG7O28/yTIPFz59BbeblG8 J1IP+J89Wx5DUnXqRCZX+AVb4yWGGqaf+MaXFxwL10xbZW0W3MzUJUc8wYQOV4ZdRKQSMwA4b xxhWKqppEsi9fMGFA4Jq87DdMrlBj2oDeaze87aQ5czgNNkMNVBqv540OTF1cNMQY4cgNDbK6 ae0K+if181IjCPy+JngkH6Bgo4AJ+pXnkrAa1ZqVKO0Legy5tZqkV4zNokquZFofgpFa1N6a4 AdON4ng0rzZccQHnnoRjWE7ixsbD0stz2dUogPEwsnVsRaym82xr4CUBM86T72v4/dQtMO8PX ksG34P5/BtxKIHVwQU79jqiibckVatWN7nv9zLP8GwB+4C16ZW/56kednXSMNAdTM+9fxV3ai Yc6EIEeS1iU84ngKKRK/IG9pe2k68CvFuz+QCmyNm/sO1vqhZFo+7mXaOc1WaMwGAl2c/XKfe /XiGWkhUdBW5NxgzY4i4Pw9DlZ48ZkW2Tls5cpZXmQKorjoqVP1q6d9CHUWqEKyTZY+HIPTVP PGFM/FEN3c3jt6okVYumSkjojVs6R4plwusV9m3i7HZ5BUTByuTmTAquht4TeUKcBG/A= Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 34 Organization: linux.* mail to news gateway X-Original-Cc: Rachel Kim , devel@driverdev.osuosl.org, Chris Park , gregkh@linuxfoundation.org, Stanislav Kholmanskikh , Johnny Kim , linux-kernel@vger.kernel.org, Tony Cho , Glen Lee , Leo Kim , Arnd Bergmann X-Original-Date: Wed, 21 Oct 2015 00:47:24 +0200 X-Original-Message-ID: <1445381258-1455986-6-git-send-email-arnd@arndb.de> X-Original-References: <1445381258-1455986-1-git-send-email-arnd@arndb.de> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1252323 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 --- drivers/staging/wilc1000/linux_wlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 50477d70eb24..d3cc255cd91b 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -701,7 +701,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; /* NO_ENCRYPT, 0x79 */ + c_val[0] = NO_SECURITY; /* NO_ENCRYPT, 0x79 */ if (!wilc_wlan_cfg_set(0, WID_11I_MODE, c_val, 1, 0, 0)) goto _fail_; -- 2.1.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/