[2.6.11 PATCH] /proc/net/stat/* cleanup

[2.6.11 PATCH] /proc/net/stat/* cleanup

[Olaf Rempel]

hi list

in /proc/net/stat/[arp|ndisc]_cache the value "forced_gc_goal_miss" has no
associated member in struct neigh_statistics.

in /proc/net/stat/rt_cache the value "in_slow_mc" was printed, but without header
(16 header-names, 17 values)

patch is against vanilla 2.6.11

Olaf

diff -uN linux-2.6.11/net/core/neighbour.c.org linux-2.6.11/net/core/neighbour.c
--- linux-2.6.11/net/core/neighbour.c.org       2005-03-04 20:03:01.000000000 +0100
+++ linux-2.6.11/net/core/neighbour.c   2005-03-04 20:04:17.000000000 +0100
@@ -1948,7 +1948,7 @@
        struct neigh_statistics *st = v;

        if (v == SEQ_START_TOKEN) {
-               seq_printf(seq, "entries  allocs destroys hash_grows  lookups hits  res_failed  rcv_probes_mcast rcv_probes_ucast  periodic_gc_runs forced_gc_runs forced_gc_goal_miss\n");
+               seq_printf(seq, "entries  allocs destroys hash_grows  lookups hits  res_failed  rcv_probes_mcast rcv_probes_ucast  periodic_gc_runs forced_gc_runs\n");
                return 0;
        }

diff -uN linux-2.6.11/net/ipv4/route.c.org linux-2.6.11/net/ipv4/route.c
--- linux-2.6.11/net/ipv4/route.c.org   2005-03-04 19:45:54.000000000 +0100
+++ linux-2.6.11/net/ipv4/route.c       2005-03-04 19:47:58.000000000 +0100
@@ -393,7 +393,7 @@
        struct rt_cache_stat *st = v;

        if (v == SEQ_START_TOKEN) {
-               seq_printf(seq, "entries  in_hit in_slow_tot in_no_route in_brd in_martian_dst in_martian_src  out_hit out_slow_tot out_slow_mc  gc_total gc_ignored gc_goal_miss gc_dst_overflow in_hlist_search out_hlist_search\n");
+               seq_printf(seq, "entries  in_hit in_slow_tot in_slow_mc in_no_route in_brd in_martian_dst in_martian_src  out_hit out_slow_tot out_slow_mc  gc_total gc_ignored gc_goal_miss gc_dst_overflow in_hlist_search out_hlist_search\n");
                return 0;
        }

Re: [2.6.11 PATCH] /proc/net/stat/* cleanup

[Olaf Rempel]

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

On Sun, 24 Apr 2005 19:30:07 -0700
"David S. Miller" <davem@davemloft.net> wrote:

> Your patch is mangled by your email client, the tabs have been turned
> into spaces, so the patch will not apply.
> 
> Also, please supply a proper "Signed-off-by:" line with your changes.

Whoops. OK

Patch against 2.6.11 vanilla

/proc/net/stat/* header cleanup

Signed-off-by: Olaf Rempel <razzor@kopf-tisch.de>


[-- Attachment #2: linux-2.6.11-net-stats.patch --]
[-- Type: text/x-patch, Size: 1287 bytes --]

--- linux-2.6.11/net/core/neighbour.c.org	2005-03-02 08:37:47.000000000 +0100
+++ linux-2.6.11/net/core/neighbour.c	2005-04-25 17:52:35.000000000 +0200
@@ -1948,7 +1948,7 @@
 	struct neigh_statistics *st = v;
 
 	if (v == SEQ_START_TOKEN) {
-		seq_printf(seq, "entries  allocs destroys hash_grows  lookups hits  res_failed  rcv_probes_mcast rcv_probes_ucast  periodic_gc_runs forced_gc_runs forced_gc_goal_miss\n");
+		seq_printf(seq, "entries  allocs destroys hash_grows  lookups hits  res_failed  rcv_probes_mcast rcv_probes_ucast  periodic_gc_runs forced_gc_runs\n");
 		return 0;
 	}
 
--- linux-2.6.11/net/ipv4/route.c.org	2005-03-02 08:38:38.000000000 +0100
+++ linux-2.6.11/net/ipv4/route.c	2005-04-25 17:55:20.000000000 +0200
@@ -393,7 +393,7 @@
 	struct rt_cache_stat *st = v;
 
 	if (v == SEQ_START_TOKEN) {
-		seq_printf(seq, "entries  in_hit in_slow_tot in_no_route in_brd in_martian_dst in_martian_src  out_hit out_slow_tot out_slow_mc  gc_total gc_ignored gc_goal_miss gc_dst_overflow in_hlist_search out_hlist_search\n");
+		seq_printf(seq, "entries  in_hit in_slow_tot in_slow_mc in_no_route in_brd in_martian_dst in_martian_src  out_hit out_slow_tot out_slow_mc  gc_total gc_ignored gc_goal_miss gc_dst_overflow in_hlist_search out_hlist_search\n");
 		return 0;
 	}
 	

Re: [2.6.11 PATCH] /proc/net/stat/* cleanup

[David S. Miller]

On Mon, 25 Apr 2005 19:00:48 +0200
Olaf Rempel <razzor@kopf-tisch.de> wrote:

> On Sun, 24 Apr 2005 19:30:07 -0700
> "David S. Miller" <davem@davemloft.net> wrote:
> 
> > Your patch is mangled by your email client, the tabs have been turned
> > into spaces, so the patch will not apply.
> > 
> > Also, please supply a proper "Signed-off-by:" line with your changes.
> 
> Whoops. OK
> 
> Patch against 2.6.11 vanilla
> 
> /proc/net/stat/* header cleanup
> 
> Signed-off-by: Olaf Rempel <razzor@kopf-tisch.de>

Patch applied, thanks a lot.