From patchwork Fri Aug 10 22:01:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 176636 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 0363C2C00A7 for ; Sat, 11 Aug 2012 08:06:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 4AE049D28E; Fri, 10 Aug 2012 18:06:55 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1zsJQKi0rpCD; Fri, 10 Aug 2012 18:06:55 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id DAEA09D291; Fri, 10 Aug 2012 18:06:50 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 8D5039D291 for ; Fri, 10 Aug 2012 18:06:49 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9wXw2NasspL7 for ; Fri, 10 Aug 2012 18:06:45 -0400 (EDT) Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 81C5E9D28E for ; Fri, 10 Aug 2012 18:06:45 -0400 (EDT) Received: by wibhq12 with SMTP id hq12so1291996wib.5 for ; Fri, 10 Aug 2012 15:06:44 -0700 (PDT) Received: by 10.180.76.135 with SMTP id k7mr9218850wiw.7.1344636404420; Fri, 10 Aug 2012 15:06:44 -0700 (PDT) Received: from debian64.localnet (pD9F8B0B7.dip.t-dialin.net. [217.248.176.183]) by mx.google.com with ESMTPS id eu4sm401643wib.2.2012.08.10.15.06.42 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Aug 2012 15:06:43 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=debian64.localnet ident=chuck) by debian64.localnet with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1SzxLs-00083A-RK; Sat, 11 Aug 2012 00:06:41 +0200 From: Christian Lamparter Date: Sat, 11 Aug 2012 00:01:51 +0200 Subject: [PATCH] AP: fix erroneous "station tried TKIP" error To: hostap@lists.shmoo.com Message-Id: Cc: j@w1.fi X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com The commit 140e850a66fdbc705c63befb6a49a1ad6058b146 "VHT: Add option for requiring use of VHT" introduced a small regression where a normal 11n ap would no longer accept a station if it was configured to be protected by WPA/RSN. Cc: Mahesh Palivela Signed-hostapd: Christian Lamparter --- src/ap/ieee802_11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index dedf72a..537b555 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -785,7 +785,7 @@ static u16 check_assoc_ies(struct hostapd_data *hapd, struct sta_info *sta, #endif /* CONFIG_IEEE80211R */ #ifdef CONFIG_IEEE80211N - if ((sta->flags & (WLAN_STA_HT | WLAN_STA_VHT)) || + if ((sta->flags & (WLAN_STA_HT | WLAN_STA_VHT)) && wpa_auth_get_pairwise(sta->wpa_sm) == WPA_CIPHER_TKIP) { hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,