From patchwork Mon Feb 10 11:47:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eliad Peller X-Patchwork-Id: 3618341 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E83EB9F2D6 for ; Mon, 10 Feb 2014 11:48:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 314CB2018E for ; Mon, 10 Feb 2014 11:48:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D3BD20138 for ; Mon, 10 Feb 2014 11:48:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752746AbaBJLsI (ORCPT ); Mon, 10 Feb 2014 06:48:08 -0500 Received: from mail-we0-f173.google.com ([74.125.82.173]:39355 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752246AbaBJLsE (ORCPT ); Mon, 10 Feb 2014 06:48:04 -0500 Received: by mail-we0-f173.google.com with SMTP id x55so4080052wes.4 for ; Mon, 10 Feb 2014 03:48:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PQmi8dCfL2fLxrYB8Mt5D1LR8tlJpsDQrBbyTVZyZg8=; b=AhrSdFmARaK9j8U0+sf/qIkxOBrD6stjDrjvMYm7J//K8QDdbXwvaPnujq9gs6JONc 5BxBYtJztS7VbRG402KN8OQf4whigxukeDLE8meidcDfUtWNnR6S/6rOQoONq8kIgtt9 h4WqaJoCfMxmVLtIw4y3yqBz1jbrhP/+ce22HB22KArgXzw3XLqGVGRA75MYTaM3sMei Vg4cjgoaswBYM1B8Nu5QBYIx3lIhXibb/g5GykUy36LVIoM1cKEAjdWZRBw2IGcziQ0d GHtWKgvaWim4q4wiVrchrxShGCSBTDFIF8Iiuk2Yzw9z/JoRGQam5pKuIQrhBmj9LdMh uHtw== X-Gm-Message-State: ALoCoQlTkqmg2aHxMtLX1nliZ2J1A4XvrokYu8MzarwK+BoruJKNoL59tRsSkjk3IXLM5KLht3Uk X-Received: by 10.180.89.225 with SMTP id br1mr4836622wib.38.1392032882699; Mon, 10 Feb 2014 03:48:02 -0800 (PST) Received: from muse.amr.corp.intel.com (93-173-177-113.bb.netvision.net.il. [93.173.177.113]) by mx.google.com with ESMTPSA id ju6sm34687484wjc.1.2014.02.10.03.48.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 03:48:02 -0800 (PST) From: Eliad Peller To: "John W. Linville" Cc: Subject: [PATCH 13/18] wlcore: don't handle unsetting of default wep key Date: Mon, 10 Feb 2014 13:47:29 +0200 Message-Id: <1392032854-28126-14-git-send-email-eliad@wizery.com> X-Mailer: git-send-email 1.8.5.2.229.g4448466.dirty In-Reply-To: <1392032854-28126-1-git-send-email-eliad@wizery.com> References: <1392032854-28126-1-git-send-email-eliad@wizery.com> 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.5 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 mac80211 unsets the default wep key on disassoc. The fw doesn't support this notification, so simply ignore it. The actual flow actually triggers fw recovery in some cases, as mac80211 unsets the default key only after disassoc, when wlvif->sta.hlid, resulting in invalid hlid being passed to the fw. Signed-off-by: Eliad Peller --- drivers/net/wireless/ti/wlcore/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index bea2938..d80d40c 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -3472,6 +3472,10 @@ static void wl1271_op_set_default_key_idx(struct ieee80211_hw *hw, wl1271_debug(DEBUG_MAC80211, "mac80211 set default key idx %d", key_idx); + /* we don't handle unsetting of default key */ + if (key_idx == -1) + return; + mutex_lock(&wl->mutex); if (unlikely(wl->state != WLCORE_STATE_ON)) {