From patchwork Tue Jul 20 10:59:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 112987 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6KAxqBb031673 for ; Tue, 20 Jul 2010 10:59:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932118Ab0GTK7v (ORCPT ); Tue, 20 Jul 2010 06:59:51 -0400 Received: from he.sipsolutions.net ([78.46.109.217]:50831 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753009Ab0GTK7v (ORCPT ); Tue, 20 Jul 2010 06:59:51 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1ObAXm-00014k-N8; Tue, 20 Jul 2010 12:59:26 +0200 Subject: Re: [PATCH v3] mac80211: remove wep dependency From: Johannes Berg To: "John W. Linville" Cc: linux-wireless@vger.kernel.org In-Reply-To: <1278529669-9904-1-git-send-email-linville@tuxdriver.com> References: <1278528270-9703-1-git-send-email-linville@tuxdriver.com> <1278529669-9904-1-git-send-email-linville@tuxdriver.com> Date: Tue, 20 Jul 2010 12:59:48 +0200 Message-ID: <1279623588.3706.17.camel@jlt3.sipsolutions.net> Mime-Version: 1.0 X-Mailer: Evolution 2.30.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Jul 2010 10:59:52 +0000 (UTC) --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1228,6 +1228,10 @@ static int ieee80211_scan(struct wiphy *wiphy, static int ieee80211_auth(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_auth_request *req) { + if (req->auth_type == NL80211_AUTHTYPE_SHARED_KEY && + IS_ERR(sdata->local->wep_tx_tfm)) + return -EINVAL; + return ieee80211_mgd_auth(IEEE80211_DEV_TO_SUB_IF(dev), req); }