From patchwork Mon Apr 21 04:52:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 4022301 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 21A529F44A for ; Mon, 21 Apr 2014 04:55:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 507FC2021B for ; Mon, 21 Apr 2014 04:54:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D4C720218 for ; Mon, 21 Apr 2014 04:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751489AbaDUEy4 (ORCPT ); Mon, 21 Apr 2014 00:54:56 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:47980 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751381AbaDUEyy (ORCPT ); Mon, 21 Apr 2014 00:54:54 -0400 Received: by mail-pa0-f49.google.com with SMTP id lj1so3333948pab.36 for ; Sun, 20 Apr 2014 21:54:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=XzuWOmlV2oUPPfsgKqLrhA0TT74A9ZuebHIi1+wueD0=; b=iwUVDrXKHzIOEUsh0RJD9QQCziULJ8sTos5QQzV5QtxDHPSuTfhw9jkFbzW0bLnkTt sIKxzF1n8DN1FJOgAN8CdfgE0cJrJ7XFGEdkELDfLDco3C/pJDwcHCqBpNSfu7A6fq7C t+fWU7c+uEwRrTIH8AgMyGeTJFT9RkuoxUIoBBQexrD40T/j9oFoAdnnx+4Us7JuNY2Z puNB/Vf3IXuRzXJMLDZnFpo1zVdfSuRPabVrHwXpssH5KBDMXniI1dAvCp7v5pyJUr+/ M4zOkP1fp/8wrI/AuQ8YNA+m9qpejQvskFtPulxgQZotMTmuZKM4wBDxTk6JTCle9tnw gLqg== X-Received: by 10.67.30.168 with SMTP id kf8mr36164521pad.84.1398056093772; Sun, 20 Apr 2014 21:54:53 -0700 (PDT) Received: from localhost.localdomain ([61.157.126.13]) by mx.google.com with ESMTPSA id gj9sm75124104pbc.7.2014.04.20.21.54.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Apr 2014 21:54:53 -0700 (PDT) From: "Zhao, Gang" To: Cc: Johannes Berg Subject: [PATCH 02/12] mac80211: remove config option check Date: Mon, 21 Apr 2014 12:52:57 +0800 Message-Id: <3ed41ac7f29b74d7cfc81c42715cf2dc1706066c.1398055854.git.gamerh2o@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: References: In-Reply-To: References: 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.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 Sanity check and error handling code shouldn't be put into CONFIG_MAC80211_VERBOSE_DEBUG block, since verbose debug option is used to control whether to print debug messages. Signed-off-by: Zhao, Gang --- net/mac80211/tx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 48650da..59715da 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1205,13 +1205,11 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local, struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); int q = info->hw_queue; -#ifdef CONFIG_MAC80211_VERBOSE_DEBUG if (WARN_ON_ONCE(q >= local->hw.queues)) { __skb_unlink(skb, skbs); ieee80211_free_txskb(&local->hw, skb); continue; } -#endif spin_lock_irqsave(&local->queue_stop_reason_lock, flags); if (local->queue_stop_reasons[q] ||