From patchwork Mon Jan 20 14:21:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3512991 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5027DC02DD for ; Mon, 20 Jan 2014 14:25:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F53420173 for ; Mon, 20 Jan 2014 14:25:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 419C120170 for ; Mon, 20 Jan 2014 14:25:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753331AbaATOZn (ORCPT ); Mon, 20 Jan 2014 09:25:43 -0500 Received: from mail-ea0-f169.google.com ([209.85.215.169]:43364 "EHLO mail-ea0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751868AbaATOZl (ORCPT ); Mon, 20 Jan 2014 09:25:41 -0500 Received: by mail-ea0-f169.google.com with SMTP id l9so2740811eaj.14 for ; Mon, 20 Jan 2014 06:25:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YmT0Qwkz3rSoiLKajkP1rw8mkhUM8NPPbyrhw3ldV+Y=; b=d54cvZrWmeY7iMM4WGeCNuayaNkJjKN/t7o4zLiYly5wcjnoBvxfKD+s9a8XOFsFvU YEnBqDM4E+0x8OCyW+DfA0Msd5rL48Gac+m4PYjPjEIC6wFIcvDyozsJSwJ/gZu80QLy IIbInhw6+BtPPF9Tw8+ux392yWdfuXpo476wo= 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=YmT0Qwkz3rSoiLKajkP1rw8mkhUM8NPPbyrhw3ldV+Y=; b=L0Sfu3KpvGrrRjjal7r7JJo5TenRrgZjNe++nFiR2kut7dgHEtpg6iCpgJN6NpO0WB dWIvLq2/Cu51uFInmb+nfl6crg7mvp9Tgwt7RN/D/fjWlpAVIposkDiauK3tZ4fOHGka ZZtmztq7GiYk/fj6hJfVd37v4Poj4a5bka/DpWrKGPFpbXPgAkX+W3pmH1AKe/cAIIgY Bfq2bIrXfiIb/YltcorrTjtU2pGfTGr23EK5U22iUPfeo/XPDi5KjhvepNqgQ+y8CHg8 HSbksT6/nzOJnY1mX+v3hLsf2ci5VZraCe1F00x+bGCADH16RB8NRZGE7k/DfAFU3G/z mawA== X-Gm-Message-State: ALoCoQkVHGvYMKoFcgkTiFRf/22OA1512KOyYfHbLDjGJXw7SgP9YSloOJrjvMjmZBLDjmUy5EtKDr2PAkKR7funMdOqZUU3T+tdOtJxjfR1jdbLSgLr5M4= X-Received: by 10.14.214.200 with SMTP id c48mr12844eep.115.1390227940064; Mon, 20 Jan 2014 06:25:40 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id 46sm3702597ees.4.2014.01.20.06.25.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jan 2014 06:25:39 -0800 (PST) From: Michal Kazior To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Michal Kazior Subject: [PATCH 2/7] mac80211: treat IBSS CSA finish failure seriously Date: Mon, 20 Jan 2014 15:21:05 +0100 Message-Id: <1390227670-19030-3-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1390227670-19030-1-git-send-email-michal.kazior@tieto.com> References: <1390227670-19030-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.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.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Other interface modes are checked against failure. This should avoid false-positive channel switch events where IBSS CSA actually failed. Signed-off-by: Michal Kazior --- net/mac80211/cfg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 62bf6c4..76fe1f90 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3039,7 +3039,9 @@ static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) return; break; case NL80211_IFTYPE_ADHOC: - ieee80211_ibss_finish_csa(sdata); + err = ieee80211_ibss_finish_csa(sdata); + if (err < 0) + return; break; #ifdef CONFIG_MAC80211_MESH case NL80211_IFTYPE_MESH_POINT: