From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Jul 2010 21:55:45 +0000 (+0200)
Subject: rstp: Update dump patch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15a945308166aff6a7e04d891dd3c22b526234d2;p=ipfire-3.x.git

rstp: Update dump patch.
---

diff --git a/pkgs/core/rstp/patches/rstp-0.21-dump-commands.patch b/pkgs/core/rstp/patches/rstp-0.21-dump-commands.patch
index 1897e839e..cc48819b8 100644
--- a/pkgs/core/rstp/patches/rstp-0.21-dump-commands.patch
+++ b/pkgs/core/rstp/patches/rstp-0.21-dump-commands.patch
@@ -1,8 +1,8 @@
 diff --git a/ctl_main.c b/ctl_main.c
-index dd041d7..49dfaf9 100644
+index dd041d7..7382d97 100644
 --- a/ctl_main.c
 +++ b/ctl_main.c
-@@ -443,6 +443,236 @@ static int cmd_debuglevel(int argc, char *const *argv)
+@@ -443,6 +443,240 @@ static int cmd_debuglevel(int argc, char *const *argv)
  	return CTL_set_debug_level(getuint(argv[1]));
  }
  
@@ -55,6 +55,10 @@ index dd041d7..49dfaf9 100644
 +	printf(DUMP_FMT(br_name, "max_age"));
 +	printf("%u\n", s.max_age);
 +
++	/* protocol version */
++	printf(DUMP_FMT(br_name, "protocol_version"));
++	printf("%d\n", s.protocol_version);
++
 +	/* root path cost */
 +	printf(DUMP_FMT(br_name, "root_path_cost"));
 +	printf("%u\n", s.root_path_cost);
@@ -239,7 +243,7 @@ index dd041d7..49dfaf9 100644
  struct command {
  	int nargs;
  	int optargs;
-@@ -483,6 +713,10 @@ static const struct command commands[] = {
+@@ -483,6 +717,10 @@ static const struct command commands[] = {
  	{2, 0, "portmcheck", cmd_portmcheck,
  	 "<bridge> <port>\ttry to get back from STP to RSTP mode"},
  	{1, 0, "debuglevel", cmd_debuglevel, "<level>\t\tLevel of verbosity"},