From patchwork Mon Nov 16 09:56:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jussi Kivilinna X-Patchwork-Id: 60240 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAGA6JpS001133 for ; Mon, 16 Nov 2009 10:06:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480AbZKPKGM (ORCPT ); Mon, 16 Nov 2009 05:06:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750885AbZKPKGM (ORCPT ); Mon, 16 Nov 2009 05:06:12 -0500 Received: from saarni.dnainternet.net ([83.102.40.136]:56335 "EHLO saarni.dnainternet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751331AbZKPKGM (ORCPT ); Mon, 16 Nov 2009 05:06:12 -0500 X-Greylist: delayed 562 seconds by postgrey-1.27 at vger.kernel.org; Mon, 16 Nov 2009 05:06:11 EST Received: from localhost (localhost [127.0.0.1]) by saarni.dnainternet.net (Postfix) with ESMTP id 8EB04576F9; Mon, 16 Nov 2009 11:56:54 +0200 (EET) X-Virus-Scanned: DNA Postiturva at dnainternet.net X-Spam-Flag: NO X-Spam-Score: 1.068 X-Spam-Level: * X-Spam-Status: No, score=1.068 tagged_above=-9999 required=6 tests=[AWL=-1.634, HELO_LH_HOME=2.602, RDNS_DYNAMIC=0.1] Received: from saarni.dnainternet.net ([83.102.40.136]) by localhost (saarni.dnainternet.net [127.0.0.1]) (amavisd-new, port 10041) with ESMTP id JUxVI7apOTQR; Mon, 16 Nov 2009 11:56:54 +0200 (EET) Received: from kirsikkapuu.dnainternet.net (kirsikkapuu.dnainternet.net [83.102.40.214]) by saarni.dnainternet.net (Postfix) with ESMTP id 6785F575EE; Mon, 16 Nov 2009 11:56:54 +0200 (EET) Received: from fate.lan (dyn2-85-23-163-235.psoas.suomi.net [85.23.163.235]) by kirsikkapuu.dnainternet.net (Postfix) with ESMTP id 574D07F004; Mon, 16 Nov 2009 11:56:54 +0200 (EET) From: Jussi Kivilinna Subject: [PATCH] rndis_wlan: handle NL80211_AUTHTYPE_AUTOMATIC To: "John W. Linville" Cc: linux-wireless@vger.kernel.org Date: Mon, 16 Nov 2009 11:56:54 +0200 Message-ID: <20091116095653.17419.49151.stgit@fate.lan> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 54175b6..dfc61fd 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c @@ -1070,7 +1070,8 @@ static int set_auth_mode(struct usbnet *usbdev, u32 wpa_version, auth_mode = NDIS_80211_AUTH_WPA_NONE; } else if (auth_type == NL80211_AUTHTYPE_SHARED_KEY) auth_mode = NDIS_80211_AUTH_SHARED; - else if (auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM) + else if (auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM || + auth_type == NL80211_AUTHTYPE_AUTOMATIC) auth_mode = NDIS_80211_AUTH_OPEN; else return -ENOTSUPP;