From patchwork Wed Aug 5 10:15:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 6947721 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 38DE99F358 for ; Wed, 5 Aug 2015 10:15:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DFC620480 for ; Wed, 5 Aug 2015 10:14:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CBE8203AE for ; Wed, 5 Aug 2015 10:14:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751734AbbHEKO4 (ORCPT ); Wed, 5 Aug 2015 06:14:56 -0400 Received: from mail-la0-f50.google.com ([209.85.215.50]:33869 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750863AbbHEKOz (ORCPT ); Wed, 5 Aug 2015 06:14:55 -0400 Received: by labow3 with SMTP id ow3so25447985lab.1 for ; Wed, 05 Aug 2015 03:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=vb38n6f7wdcIfFk7AZZXXrvU3KXm7e/F+4iqWOJaUjs=; b=Vm4sZfffpr6gGhNG1ppPcI6eJYxXfXLobYOfcoKwDepRH/e4c4Bi7BEUBLLAzxl7Y4 +dIPH6tWJPU15khDH1VBKx5QipQqJ9x4FIkAKQv6WSHHxvIK2kn1pFSGGb5iQ/DuIOXB fTtjjH+ksZeB0eQw3I2s9fShKH0P2etq1XAlw= 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=vb38n6f7wdcIfFk7AZZXXrvU3KXm7e/F+4iqWOJaUjs=; b=a4LadVY/A15flTkbdxJoKtpjqkSqW0Vbjkjxhh59T7ODUipfXzQfOtegGPHP2Ek4LC 9hzsB9j//vSjRVP0cmtuwpBCRHzIjEH4YgZIFvINtruP7GqJly+zWztrW7xroIgvIAAn Akfw866h4RZEYuctE7c1Qdg6QCHbnNOaxv2Z9ahluZelSYlyFwDZptfn8yN2MwbtQrcL FMviFoZvPivlZAkWp/2PulAEz1haPB6C9G444ppgv04eqN/jidwg82YHIua+ZGdMJLgl fVgBWzKDpqo/ngMhBMjw77QfOvHExWkU9gyLwErXv8Wxmfrn2qrFHuWbi5m82yuwuMTA 4JqQ== X-Gm-Message-State: ALoCoQlX7ibhkRs/Y+TShI5gGrtR3wx3h9pRPiVOQVzj9yoiBjSm9ylFRl8PIkB+6zhzAyt7+1xlWIg/cvaRfTJUlZ2QUDNzs0uOJDD0pvIlSxyzNAl/udrSS72IN7g0UDhpARnlC9av X-Received: by 10.152.22.99 with SMTP id c3mr8845329laf.32.1438769694020; Wed, 05 Aug 2015 03:14:54 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id si3sm445460lbb.32.2015.08.05.03.14.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Aug 2015 03:14:53 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 1/2] ath10k: don't remove peer that doesn't exist Date: Wed, 5 Aug 2015 12:15:23 +0200 Message-Id: <1438769724-29438-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 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.9 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 If peer creation failed during offchannel Tx the driver attempted to delete the peer nonetheless. This caused the ar->num_peers counter to be incorrectly decremented. This subsequently could cause the counter to drop below 0 and also eventually lead to firmware crash because host would think there are less peer entries created in firmware then there really were. 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 acd222f3b899..4f6dddac8e43 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3346,6 +3346,7 @@ void ath10k_offchan_tx_work(struct work_struct *work) int vdev_id; int ret; unsigned long time_left; + bool tmp_peer_created = false; /* FW requirement: We must create a peer before FW will send out * an offchannel frame. Otherwise the frame will be stuck and @@ -3383,6 +3384,7 @@ void ath10k_offchan_tx_work(struct work_struct *work) if (ret) ath10k_warn(ar, "failed to create peer %pM on vdev %d: %d\n", peer_addr, vdev_id, ret); + tmp_peer_created = (ret == 0); } spin_lock_bh(&ar->data_lock); @@ -3398,7 +3400,7 @@ void ath10k_offchan_tx_work(struct work_struct *work) ath10k_warn(ar, "timed out waiting for offchannel skb %p\n", skb); - if (!peer) { + if (!peer && tmp_peer_created) { ret = ath10k_peer_delete(ar, vdev_id, peer_addr); if (ret) ath10k_warn(ar, "failed to delete peer %pM on vdev %d: %d\n",