From patchwork Mon Nov 24 13:15:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5366451 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 BAF139F2F5 for ; Mon, 24 Nov 2014 13:27:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E85D4203B4 for ; Mon, 24 Nov 2014 13:27:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D646203B6 for ; Mon, 24 Nov 2014 13:27:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754166AbaKXN1n (ORCPT ); Mon, 24 Nov 2014 08:27:43 -0500 Received: from mail-wi0-f172.google.com ([209.85.212.172]:52550 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754133AbaKXN1l (ORCPT ); Mon, 24 Nov 2014 08:27:41 -0500 Received: by mail-wi0-f172.google.com with SMTP id n3so5650920wiv.5 for ; Mon, 24 Nov 2014 05:27: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; bh=AGKeIxpj0DBCilOsN0avGnGVh6pc4/65wX1K48Jlg20=; b=eWkTIyzPx2sbkSNf2rWRyLs6HCKpDfJp6ZJy2nEJLzUAtyGD7vMhE2wybvoBK/0gqh YFpcbd1HG3DbhKrNPGJFi/Xt1srF5cjR1c6pUGkM2ffJP/RN7EOVaQ6nasyGcPW1rNjJ +cIGPUQgYuLliqtUkE6cQaiKd50DA50kD9Ews= 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; bh=AGKeIxpj0DBCilOsN0avGnGVh6pc4/65wX1K48Jlg20=; b=CclL8voV8itAGvOTndNQSdxAgH8DO/6UaCW3ZPGvzbvARgcDvhMG6cWA+03EyB+8SP dq5K4fT4owGPfm78Oum7OvhHyy+dgRwhKz+LaKgvj66oW77C4iNjWJt330d+YAWR97+y oS9B27Z8AtDzY13fvNgkIANOQDAx3UXhOoha3aytZQI3YgrbZ59vzoWZx8wq810CjI1H GeRjIAn43WeFkbyKdLqkcd70f3jL8dUM1zKLocmrrD4WlJ/42YYTMwxypl+jYpsBqzjT 5R/YCzbRs3HJjM2dNYVg6fqrrwYBDfXGTDtTo0v6iopMK2tVaEJ1T7k3dORMJQY5GHI9 fM4g== X-Gm-Message-State: ALoCoQmKZe120s0q6yYG+hKPMh6qeaM7BPRTn5+hnI8kInvXeU2wJB+WGRRqx+p4Q4/4RlINyg7oKzK6J6bCcAEpxJsVGia8ZX5EfI0Q71p6ZfVFIMjVqRaGpJxahUYxgapXJjsIY/BE X-Received: by 10.194.134.234 with SMTP id pn10mr34968200wjb.34.1416835660117; Mon, 24 Nov 2014 05:27:40 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id vy7sm21026912wjc.27.2014.11.24.05.27.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Nov 2014 05:27:39 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 1/3] ath10k: add missing goto Date: Mon, 24 Nov 2014 14:15:07 +0100 Message-Id: <1416834909-7130-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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);