From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752991AbbKPOGR (ORCPT ); Mon, 16 Nov 2015 09:06:17 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:64572 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120AbbKPOF0 (ORCPT ); Mon, 16 Nov 2015 09:05:26 -0500 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Johnny Kim , Austin Shin , Chris Park , Tony Cho , Glen Lee , Leo Kim , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 05/19] staging/wilc1000: use NO_SECURITY instead of NO_ENCRYPT Date: Mon, 16 Nov 2015 15:04:56 +0100 Message-Id: <1447682710-2908925-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1447682710-2908925-1-git-send-email-arnd@arndb.de> References: <1447682710-2908925-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:0f9fF1kh16I6plHKzXSCJkTto38nMwjWAWYuuwOEr8mOB0GaMem 912wS8pWrYBEhjiHuLbeYJp64kD7FwxhXWFUbn8Yow00sqg5PiN6Ofv40b7X2Y9aO8Ntkz7 mHjaqplw9MnYybUs3VYXWNY8MtGGR5rRI202oNgibzQ7RPfHoa3hfDeXB7Dam0zzIDJLWOK b6tK2iALZBfPIChxcf8qQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:HC6pjoXp4qk=:/OFwUKm3VSz3YsBXbqZYFm MjzCOZCVlEPybLbxMxffcmVaSEOfZTBFUQuHBwwNUP1D77pewy9d2248geSL7igc1WjnvMZ53 9h4h6fJcn+kOXHgxdZe04oI/d376Xu4M1+k6gKg6znq4gqlBlHxn9UxA6CWUnvaGsnb+TGN+z WgwYoUuR6krSSahoeq188dPQ2YrCiAQXhB2xRJmJK2wZ8Ld83pBEO7LZGxDx97D9P/TvbGMlR Sb/tVVrsdqBKUz6UGt2cwvrWggPUPpL8gdXumcGNIaknF9qvnzoNsqNS391QtOZskiYoGJiSr jGYItjyhKpcZc1Pd1ych/ydfICEUFkwcSh3LTZHooWmjHF2wo2qsdAOMM3V9lvTFnG9HONSOG 9cfn6rZRi2Ad+htS8mbcpPOqE+Ts1IiO9JhO26ANw+x7Wl9VGuFikYAG4LH4WNmJQN+XPKmYl 9JQG2lZWnZE+h38so20V9s0LshyHdqw72DywKKxCnTDLeBicHE5ISabCUvjackhWUZ6IlrqzU HjdTUyHZVJTvuDqkzf/SUUm+ciqsMqFQLgdkhUHuNMmG+iETu6NqR4JKoOwAMaPmzLMYLNMRF MPHeSnzDo7QY6dyMU+uCRyfpoLbGybH4aAqLkw+pt4WG3IGTsPkrzSUFWG+MuUGx5wjGW9UJ9 vqrRFey4oqFBxbwpXSUnXApkYXa15aAILzVfaa2SbKDS9pIQMt+JkO33KjPzUtfIcCjM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 f1e70b225deb..040caa0d0d0b 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -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_; -- 2.1.0.rc2