From patchwork Tue Nov 10 23:42:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7593041 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1786DBF90C for ; Tue, 10 Nov 2015 23:50:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F406205F9 for ; Tue, 10 Nov 2015 23:50:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64BCD205EB for ; Tue, 10 Nov 2015 23:50:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752511AbbKJXtQ (ORCPT ); Tue, 10 Nov 2015 18:49:16 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:58880 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751893AbbKJXm6 (ORCPT ); Tue, 10 Nov 2015 18:42:58 -0500 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0MVrSa-1ZuE8C3Gsy-00X7yh; Wed, 11 Nov 2015 00:42:52 +0100 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 06/20] staging/wilc1000: use NO_SECURITY instead of NO_ENCRYPT Date: Wed, 11 Nov 2015 00:42:26 +0100 Message-Id: <1447198960-2760143-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1447198960-2760143-1-git-send-email-arnd@arndb.de> References: <1447198960-2760143-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:mSvef/ormRxj7nvNKkVmNN+v7tDJwH1uLxEOAtjhW6s36q3iXP8 N3nrtesWo9Wryu8Y9/8Vh0SL84LEX6wPM+4E1Ky+PisITh+VVm2YG8o3x5xUa5+hT2UuQ3U Zu0s814iMdl3ySXLM+0XhQh8dTpJfi89QVrfUqPBY9or7qqUFAmJsPprXNhhjL1qFs6/DG2 NBrGt1PIE8qte9x4xq2ZA== X-UI-Out-Filterresults: notjunk:1; V01:K0:VLDykrkJRw8=:EIi4XaSOoOtPZsgTpAZuua z4RypTJXBFlu0+nCKpjSRXYUb0B71tamiV3M8Ryofjmj/E5jAnFDL5QBeubv23TN0qVxjh3/M iP2ot1XMYTemqxqtd4Fnd6PXy4HxaJo/S6iwCV3mWhoqIRjQEHIRXFqWxNixnmuKfBtcPCYjS 5bwWi9CScMD+1H1WylwcgtbW6X4fTsTSTGu5FaYktYHM/YYBNIRT8gcHILZ4VTDB7CbMbNPH1 A4rJ0q6suv6rOmtxEpBN/JVK36SGTHGBtT3moIN3GsQSHjc+yw463sBixBtiU79MFF9aeC5HR 4WPloyRcZdi3oZCeJzuhOzYT0mmVmyK0K4Wy2DLOft2jQdFoWp4CUF7ZviT674016LGvaTE4V or/VV+JBv69MnzProxtyCGZA3WPBYoKIuHO3Q971To/o+EF5mulfMQI6qZwVJH1eEyH9gI1Gk q29srn89HvlHRW8EmrXFxA/x4rL/52OT36QRPs9JG2QFKJ2FFyr0Clu1n1zKyONEEzJ+Z9DP0 1JILYJsL4vxDhyUNYjDXV0gF8HgsR4cVQHEKxY17pdvL+ac1B18VC09aK5Aw9abiSfLZ/WEHo 2ZkMd9uR/XYRnnT64YLGgTJr/4Sb9el8kYSYH5EDnoqefdhdL0fpH4VQ4+sRi0DHh7EHqtz7y dav0Ik9/RCbTnyGTRtHXwXj/PlQGgEj9IWg02gacEBgoTUuIqFHmzK4JbQvJfNvfWWvY= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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_;