From patchwork Mon Apr 14 09:51:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang ZHAO X-Patchwork-Id: 3979111 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1F24FC0DA2 for ; Mon, 14 Apr 2014 09:54:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 625C6201FE for ; Mon, 14 Apr 2014 09:54:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E30C201FA for ; Mon, 14 Apr 2014 09:54:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753788AbaDNJxx (ORCPT ); Mon, 14 Apr 2014 05:53:53 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:62608 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751883AbaDNJv5 (ORCPT ); Mon, 14 Apr 2014 05:51:57 -0400 Received: by mail-pd0-f178.google.com with SMTP id x10so7859656pdj.23 for ; Mon, 14 Apr 2014 02:51:56 -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=w3pXGrf2L8HJsnC2rwrH4JFyPTGcqxLou0iQKbw//zIipkvnX9mkfiJmZLhIwsOxLF 4CiBfWey56f0g0ODdokETuFOPnUE89BkF6wDVPayc7Quy2OZ8c6ZHOWwZGO/7ScSLaZo /ylnghA5kx/zSqeOeFFNwnATwOxRb+s6R2N/N6G57+887VT33w2ch7LrNT8bYNRX7EQA IP4vYIZuimZjwGULDf2IiUwoZ3Kb0tw9kQbPe/kpcWkskITQ27+ffeVWYw0qYlfnG6zT lancSUgM5AIKwzFfAnL/Jk2p7cmuPTmgrCxUqUq6aWjW7bAJN9LncS3S45R1Sph1ZF+R Y6Sw== X-Received: by 10.68.225.74 with SMTP id ri10mr2621710pbc.116.1397469116736; Mon, 14 Apr 2014 02:51:56 -0700 (PDT) Received: from localhost.localdomain ([175.153.40.114]) by mx.google.com with ESMTPSA id j3sm32747430pbh.38.2014.04.14.02.51.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Apr 2014 02:51:56 -0700 (PDT) From: "Zhao, Gang" To: Cc: Johannes Berg Subject: [PATCH 2/6] mac80211: remove config option check Date: Mon, 14 Apr 2014 17:51:31 +0800 Message-Id: X-Mailer: git-send-email 1.9.0 In-Reply-To: <8b5c4a61ae1f49400478b030fa7ae4e3a5ca2bcb.1397469035.git.gamerh2o@gmail.com> References: <8b5c4a61ae1f49400478b030fa7ae4e3a5ca2bcb.1397469035.git.gamerh2o@gmail.com> In-Reply-To: <8b5c4a61ae1f49400478b030fa7ae4e3a5ca2bcb.1397469035.git.gamerh2o@gmail.com> References: <8b5c4a61ae1f49400478b030fa7ae4e3a5ca2bcb.1397469035.git.gamerh2o@gmail.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_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] ||