From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751915AbXC3S7A (ORCPT ); Fri, 30 Mar 2007 14:59:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751947AbXC3S7A (ORCPT ); Fri, 30 Mar 2007 14:59:00 -0400 Received: from crystal.sipsolutions.net ([195.210.38.204]:43790 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751915AbXC3S67 convert rfc822-to-8bit (ORCPT ); Fri, 30 Mar 2007 14:58:59 -0400 Subject: Re: 2.6.21-rc5-mm3 From: Johannes Berg To: Valdis.Kletnieks@vt.edu Cc: Andrew Morton , linux-kernel@vger.kernel.org In-Reply-To: <200703301723.l2UHNO59025665@turing-police.cc.vt.edu> References: <20070330010559.2a232d9a.akpm@linux-foundation.org> <200703301723.l2UHNO59025665@turing-police.cc.vt.edu> Content-Type: text/plain; charset=utf-8 Date: Fri, 30 Mar 2007 20:58:01 +0200 Message-Id: <1175281081.23438.10.camel@johannes.berg> Mime-Version: 1.0 X-Mailer: Evolution 2.8.2.1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2007-03-30 at 13:23 -0400, Valdis.Kletnieks@vt.edu wrote: > On Fri, 30 Mar 2007 01:05:59 PDT, Andrew Morton said: > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.21-rc5/2.6.21-rc5-mm3/ > > Building with CONFIG_MAC80211_DEBUGFS=y but CONFIG_MAC80211_DEBUG_COUNTERS=n > blows chunks on my box: > > CC [M] net/mac80211/debugfs.o > net/mac80211/debugfs.c: In function ‘stats_wme_rx_queue_read’: > net/mac80211/debugfs.c:266: error: ‘struct ieee80211_local’ has no member named ‘wme_rx_queue’ > net/mac80211/debugfs.c: In function ‘stats_wme_tx_queue_read’: > net/mac80211/debugfs.c:286: error: ‘struct ieee80211_local’ has no member named ‘wme_tx_queue’ > make[2]: *** [net/mac80211/debugfs.o] Error 1 Yeah, my mistake. I posted a patch to fix it to wireless-dev but John is on vacation, below is a copy. If you want to put it anywhere here's my Signed-off-by: Johannes Berg --- net/mac80211/debugfs.c | 20 ++++++++++---------- net/mac80211/debugfs_sta.c | 4 ++++ net/mac80211/ieee80211_i.h | 4 ++-- net/mac80211/sta_info.h | 2 ++ 4 files changed, 18 insertions(+), 12 deletions(-) --- wireless-dev.orig/net/mac80211/debugfs.c 2007-03-28 22:57:03.937731699 +0200 +++ wireless-dev/net/mac80211/debugfs.c 2007-03-28 22:59:12.287731699 +0200 @@ -246,12 +246,6 @@ DEBUGFS_STATS_FILE(rx_handlers_fragments local->rx_handlers_fragments); DEBUGFS_STATS_FILE(tx_status_drop, 20, "%u", local->tx_status_drop); -#endif - -DEBUGFS_DEVSTATS_FILE(dot11ACKFailureCount); -DEBUGFS_DEVSTATS_FILE(dot11RTSFailureCount); -DEBUGFS_DEVSTATS_FILE(dot11FCSErrorCount); -DEBUGFS_DEVSTATS_FILE(dot11RTSSuccessCount); static ssize_t stats_wme_rx_queue_read(struct file *file, char __user *userbuf, @@ -292,6 +286,12 @@ static const struct file_operations stat .read = stats_wme_tx_queue_read, .open = mac80211_open_file_generic, }; +#endif + +DEBUGFS_DEVSTATS_FILE(dot11ACKFailureCount); +DEBUGFS_DEVSTATS_FILE(dot11RTSFailureCount); +DEBUGFS_DEVSTATS_FILE(dot11FCSErrorCount); +DEBUGFS_DEVSTATS_FILE(dot11RTSSuccessCount); void debugfs_hw_add(struct ieee80211_local *local) @@ -360,13 +360,13 @@ void debugfs_hw_add(struct ieee80211_loc DEBUGFS_STATS_ADD(rx_expand_skb_head2); DEBUGFS_STATS_ADD(rx_handlers_fragments); DEBUGFS_STATS_ADD(tx_status_drop); + DEBUGFS_STATS_ADD(wme_tx_queue); + DEBUGFS_STATS_ADD(wme_rx_queue); #endif DEBUGFS_STATS_ADD(dot11ACKFailureCount); DEBUGFS_STATS_ADD(dot11RTSFailureCount); DEBUGFS_STATS_ADD(dot11FCSErrorCount); DEBUGFS_STATS_ADD(dot11RTSSuccessCount); - DEBUGFS_STATS_ADD(wme_tx_queue); - DEBUGFS_STATS_ADD(wme_rx_queue); } void debugfs_hw_del(struct ieee80211_local *local) @@ -419,13 +419,13 @@ void debugfs_hw_del(struct ieee80211_loc DEBUGFS_STATS_DEL(rx_expand_skb_head2); DEBUGFS_STATS_DEL(rx_handlers_fragments); DEBUGFS_STATS_DEL(tx_status_drop); + DEBUGFS_STATS_DEL(wme_tx_queue); + DEBUGFS_STATS_DEL(wme_rx_queue); #endif DEBUGFS_STATS_DEL(dot11ACKFailureCount); DEBUGFS_STATS_DEL(dot11RTSFailureCount); DEBUGFS_STATS_DEL(dot11FCSErrorCount); DEBUGFS_STATS_DEL(dot11RTSSuccessCount); - DEBUGFS_STATS_DEL(wme_tx_queue); - DEBUGFS_STATS_DEL(wme_rx_queue); debugfs_remove(local->debugfs.statistics); local->debugfs.statistics = NULL; --- wireless-dev.orig/net/mac80211/ieee80211_i.h 2007-03-28 22:58:07.635731699 +0200 +++ wireless-dev/net/mac80211/ieee80211_i.h 2007-03-28 22:58:20.591731699 +0200 @@ -647,13 +647,13 @@ struct ieee80211_local { struct dentry *rx_expand_skb_head2; struct dentry *rx_handlers_fragments; struct dentry *tx_status_drop; + struct dentry *wme_tx_queue; + struct dentry *wme_rx_queue; #endif struct dentry *dot11ACKFailureCount; struct dentry *dot11RTSFailureCount; struct dentry *dot11FCSErrorCount; struct dentry *dot11RTSSuccessCount; - struct dentry *wme_tx_queue; - struct dentry *wme_rx_queue; } stats; struct dentry *stations; struct dentry *keys; --- wireless-dev.orig/net/mac80211/debugfs_sta.c 2007-03-28 22:59:49.973731699 +0200 +++ wireless-dev/net/mac80211/debugfs_sta.c 2007-03-28 23:00:22.353731699 +0200 @@ -222,8 +222,10 @@ void ieee80211_sta_debugfs_add(struct st DEBUGFS_ADD(last_ack_ms); DEBUGFS_ADD(inactive_ms); DEBUGFS_ADD(last_seq_ctrl); +#ifdef CONFIG_MAC80211_DEBUG_COUNTERS DEBUGFS_ADD(wme_rx_queue); DEBUGFS_ADD(wme_tx_queue); +#endif } void ieee80211_sta_debugfs_remove(struct sta_info *sta) @@ -234,8 +236,10 @@ void ieee80211_sta_debugfs_remove(struct DEBUGFS_DEL(last_ack_ms); DEBUGFS_DEL(inactive_ms); DEBUGFS_DEL(last_seq_ctrl); +#ifdef CONFIG_MAC80211_DEBUG_COUNTERS DEBUGFS_DEL(wme_rx_queue); DEBUGFS_DEL(wme_tx_queue); +#endif debugfs_remove(sta->debugfs.dir); sta->debugfs.dir = NULL; --- wireless-dev.orig/net/mac80211/sta_info.h 2007-03-28 23:01:03.437731699 +0200 +++ wireless-dev/net/mac80211/sta_info.h 2007-03-28 23:01:15.009731699 +0200 @@ -124,8 +124,10 @@ struct sta_info { struct dentry *last_ack_ms; struct dentry *inactive_ms; struct dentry *last_seq_ctrl; +#ifdef CONFIG_MAC80211_DEBUG_COUNTERS struct dentry *wme_rx_queue; struct dentry *wme_tx_queue; +#endif } debugfs; #endif };