From patchwork Tue Apr 5 11:24:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maya Erez X-Patchwork-Id: 8749631 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A0A19C0553 for ; Tue, 5 Apr 2016 11:24:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A72A3200F0 for ; Tue, 5 Apr 2016 11:24:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AA992038F for ; Tue, 5 Apr 2016 11:24:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758071AbcDELYU (ORCPT ); Tue, 5 Apr 2016 07:24:20 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:27539 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757824AbcDELYT (ORCPT ); Tue, 5 Apr 2016 07:24:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1459855459; x=1491391459; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=wLSOAWuq0dQ7dHrHFJp2VK8QRZADfpJhDKKHFqe0jjo=; b=G7H0cqQs5fNGS9sQ59saIOr4EMnbglgY54Dfa6sZqcV+D32wc3dPJzO8 gQxL4XSBUWzLXfyEoSHlUkIWSqF8hu92cmU+Hp/FBCa3X4ayRlyASG09p QP6GGWIs+4/LGMGCoHCUddIj3DwFfgPu09uv5d8Cp4SjCedOPm5zRG4lf o=; X-IronPort-AV: E=Sophos;i="5.24,443,1455004800"; d="scan'208";a="182633031" Received: from ironmsg02-r-new.qualcomm.com (HELO ironmsg02-R.qualcomm.com) ([10.53.140.106]) by wolverine01.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 05 Apr 2016 04:24:19 -0700 X-IronPort-AV: E=McAfee;i="5700,7163,8125"; a="703100857" Received: from lx-merez.mea.qualcomm.com ([10.18.177.171]) by ironmsg02-R.qualcomm.com with ESMTP; 05 Apr 2016 04:24:17 -0700 From: Maya Erez To: Kalle Valo Cc: Maya Erez , linux-wireless@vger.kernel.org, wil6210@qca.qualcomm.com Subject: [PATCH 4/7] wil6210: print debug message when transmitting while disconnected Date: Tue, 5 Apr 2016 14:24:04 +0300 Message-Id: <1459855447-17413-5-git-send-email-qca_merez@qca.qualcomm.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1459855447-17413-1-git-send-email-qca_merez@qca.qualcomm.com> References: <1459855447-17413-1-git-send-email-qca_merez@qca.qualcomm.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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Network stack can try to transmit data while AP / STA is disconnected. Change this print-out to debug level as this should not be handled as error. Signed-off-by: Maya Erez --- drivers/net/wireless/ath/wil6210/debug.c | 17 +++++++++++++++++ drivers/net/wireless/ath/wil6210/txrx.c | 2 +- drivers/net/wireless/ath/wil6210/wil6210.h | 4 ++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/wil6210/debug.c b/drivers/net/wireless/ath/wil6210/debug.c index 0a30127..e5395fd 100644 --- a/drivers/net/wireless/ath/wil6210/debug.c +++ b/drivers/net/wireless/ath/wil6210/debug.c @@ -49,6 +49,23 @@ void __wil_err_ratelimited(struct wil6210_priv *wil, const char *fmt, ...) } } +void __wil_dbg_ratelimited(struct wil6210_priv *wil, const char *fmt, ...) +{ + if (net_ratelimit()) { + struct net_device *ndev = wil_to_ndev(wil); + struct va_format vaf = { + .fmt = fmt, + }; + va_list args; + + va_start(args, fmt); + vaf.va = &args; + netdev_dbg(ndev, "%pV", &vaf); + trace_wil6210_log_dbg(&vaf); + va_end(args); + } +} + void __wil_info(struct wil6210_priv *wil, const char *fmt, ...) { struct net_device *ndev = wil_to_ndev(wil); diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c index f260b232..a4e4379 100644 --- a/drivers/net/wireless/ath/wil6210/txrx.c +++ b/drivers/net/wireless/ath/wil6210/txrx.c @@ -1759,7 +1759,7 @@ netdev_tx_t wil_start_xmit(struct sk_buff *skb, struct net_device *ndev) goto drop; } if (unlikely(!test_bit(wil_status_fwconnected, wil->status))) { - wil_err_ratelimited(wil, "FW not connected\n"); + wil_dbg_ratelimited(wil, "FW not connected, packet dropped\n"); goto drop; } if (unlikely(wil->wdev->iftype == NL80211_IFTYPE_MONITOR)) { diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h index 7fcfd6f..84b3fa6 100644 --- a/drivers/net/wireless/ath/wil6210/wil6210.h +++ b/drivers/net/wireless/ath/wil6210/wil6210.h @@ -640,6 +640,8 @@ __printf(2, 3) void __wil_err_ratelimited(struct wil6210_priv *wil, const char *fmt, ...); __printf(2, 3) void __wil_info(struct wil6210_priv *wil, const char *fmt, ...); +__printf(2, 3) +void __wil_dbg_ratelimited(struct wil6210_priv *wil, const char *fmt, ...); #define wil_dbg(wil, fmt, arg...) do { \ netdev_dbg(wil_to_ndev(wil), fmt, ##arg); \ wil_dbg_trace(wil, fmt, ##arg); \ @@ -659,6 +661,8 @@ void __wil_info(struct wil6210_priv *wil, const char *fmt, ...); #define wil_info(wil, fmt, arg...) __wil_info(wil, "%s: " fmt, __func__, ##arg) #define wil_err_ratelimited(wil, fmt, arg...) \ __wil_err_ratelimited(wil, "%s: " fmt, __func__, ##arg) +#define wil_dbg_ratelimited(wil, fmt, arg...) \ + __wil_dbg_ratelimited(wil, "%s: " fmt, __func__, ##arg) /* target operations */ /* register read */