From patchwork Tue Nov 25 14:16:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5379971 Return-Path: X-Original-To: patchwork-ath10k@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 525A29F3D0 for ; Tue, 25 Nov 2014 14:29:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8585D20142 for ; Tue, 25 Nov 2014 14:29:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 79C28201C0 for ; Tue, 25 Nov 2014 14:28:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XtH6n-0005Wd-25; Tue, 25 Nov 2014 14:28:49 +0000 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XtH6j-0005FU-AP for ath10k@lists.infradead.org; Tue, 25 Nov 2014 14:28:46 +0000 Received: by mail-wi0-f172.google.com with SMTP id n3so9313167wiv.5 for ; Tue, 25 Nov 2014 06:28:18 -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=AGKeIxpj0DBCilOsN0avGnGVh6pc4/65wX1K48Jlg20=; b=XdKOZMbXXi6EJQ3lG1f/HidAmX+Y2tOnM5toXU9PYGO32+yMm+nLHyL3tjqPJ5nRA4 kV4f23uDyTcoQj11YnUzKcyXLKa45P4GU7xO1bYzq6T4v+CW+yH3GvfQuhQEAoMXfJzF Ps6girL6xb6DqOLQwZHQCkFqJSWejJk3jBI1c= 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=AGKeIxpj0DBCilOsN0avGnGVh6pc4/65wX1K48Jlg20=; b=K3b7ez3jVYy9KNinxsh6hGfM4/JMyfHFP/KQbrH/lQIiE+OhtDBToT/f/1VLbLNl5x vX5M05+h7xPH2WdmCcMl1DG9IEOMZEe9fmS4irLQQ+hU5IX+6pSAx00mAvBfZNVQJ6YP ISzxMr5Y1JHlMypx/CCH6xqC34yTR5T3tN/WWWr8cdshQlLnzEWhYls1cO6Fg1zgUz6D sj7uUzwJZnWfXQzX6nZB44jlR1KPWcuo2hAWdvPnecEglKKdwvhN5yZMWIzpKoAHFDdw W27i2YC9lpf6C7ikqu2UVbM+nr4hOWoQMXOuxM+kn3NLn9UACId6C4fjeGTauaIz6Okp w7pA== X-Gm-Message-State: ALoCoQn1jv0lQvWj2V/rhe4KsrLxLzNUzdlqpvALpATClg5C1z08Q1W4DxBlXQ+iH3Vc8sBUnmjIy57ushL4BqTlkPogPf+TZksandV42CJNYJQJbs1oJEnrUPTAQ7FaVdPBgKHUwAaxVtKB5lCVH92Rlq1OHpZIDp7ck8/I41qVptSN+o1SUxk= X-Received: by 10.180.72.199 with SMTP id f7mr32223752wiv.58.1416925698010; Tue, 25 Nov 2014 06:28:18 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id u9sm2101674wjy.37.2014.11.25.06.28.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Nov 2014 06:28:17 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH v2 1/3] ath10k: add missing goto Date: Tue, 25 Nov 2014 15:16:03 +0100 Message-Id: <1416924965-28216-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1416834909-7130-1-git-send-email-michal.kazior@tieto.com> References: <1416834909-7130-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141125_062845_564227_558B821D X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_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 This prevents warning spamming if peer creation fails during sta_state in some cases. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 1245ac8..7b5a888 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3559,9 +3559,11 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, arvif->vdev_id, sta->addr, ar->num_peers); ret = ath10k_peer_create(ar, arvif->vdev_id, sta->addr); - if (ret) + if (ret) { ath10k_warn(ar, "failed to add peer %pM for vdev %d when adding a new sta: %i\n", sta->addr, arvif->vdev_id, ret); + goto exit; + } if (vif->type == NL80211_IFTYPE_STATION) { WARN_ON(arvif->is_started);