[PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces

[PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces

[Ralf Baechle]

Convert all NET/ROM sysctl time values from jiffies to ms as units.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

--

 include/net/netrom.h   |    8 ++++----
 net/netrom/af_netrom.c |   15 ++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

Index: linux-net.git/include/net/netrom.h
===================================================================
--- linux-net.git.orig/include/net/netrom.h	2006-04-29 01:43:48.000000000 +0100
+++ linux-net.git/include/net/netrom.h	2006-04-29 11:37:27.000000000 +0100
@@ -42,11 +42,11 @@ enum {
 #define	NR_COND_PEER_RX_BUSY		0x04
 #define	NR_COND_OWN_RX_BUSY		0x08
 
-#define NR_DEFAULT_T1			(120 * HZ)	/* Outstanding frames - 120 seconds */
-#define NR_DEFAULT_T2			(5   * HZ)	/* Response delay     - 5 seconds */
+#define NR_DEFAULT_T1			120000		/* Outstanding frames - 120 seconds */
+#define NR_DEFAULT_T2			5000		/* Response delay     - 5 seconds */
 #define NR_DEFAULT_N2			3		/* Number of Retries - 3 */
-#define	NR_DEFAULT_T4			(180 * HZ)	/* Busy Delay - 180 seconds */
-#define	NR_DEFAULT_IDLE			(0 * 60 * HZ)	/* No Activity Timeout - none */
+#define	NR_DEFAULT_T4			180000		/* Busy Delay - 180 seconds */
+#define	NR_DEFAULT_IDLE			0		/* No Activity Timeout - none */
 #define	NR_DEFAULT_WINDOW		4		/* Default Window Size - 4 */
 #define	NR_DEFAULT_OBS			6		/* Default Obsolescence Count - 6 */
 #define	NR_DEFAULT_QUAL			10		/* Default Neighbour Quality - 10 */
Index: linux-net.git/net/netrom/af_netrom.c
===================================================================
--- linux-net.git.orig/net/netrom/af_netrom.c	2006-04-29 01:54:21.000000000 +0100
+++ linux-net.git/net/netrom/af_netrom.c	2006-04-29 11:37:27.000000000 +0100
@@ -425,11 +425,16 @@ static int nr_create(struct socket *sock
 
 	nr_init_timers(sk);
 
-	nr->t1     = sysctl_netrom_transport_timeout;
-	nr->t2     = sysctl_netrom_transport_acknowledge_delay;
-	nr->n2     = sysctl_netrom_transport_maximum_tries;
-	nr->t4     = sysctl_netrom_transport_busy_delay;
-	nr->idle   = sysctl_netrom_transport_no_activity_timeout;
+	nr->t1     =
+		msecs_to_jiffies(sysctl_netrom_transport_timeout);
+	nr->t2     =
+		msecs_to_jiffies(sysctl_netrom_transport_acknowledge_delay);
+	nr->n2     =
+		msecs_to_jiffies(sysctl_netrom_transport_maximum_tries);
+	nr->t4     =
+		msecs_to_jiffies(sysctl_netrom_transport_busy_delay);
+	nr->idle   =
+		msecs_to_jiffies(sysctl_netrom_transport_no_activity_timeout);
 	nr->window = sysctl_netrom_transport_requested_window_size;
 
 	nr->bpqext = 1;

Re: [PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces

[Bernard Pidoux]

Ralf Baechle wrote :

> Convert all NET/ROM sysctl time values from jiffies to ms as units.
> 
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> 

With such extensive patches for netrom and rose modules that will go 
into a future 2.6.x kernel, I think it would be justified to update the 
following banners in af_rose.c and af_netrom.c respectively for they 
appear during boot :

static const char banner[] = KERN_INFO "F6FBB/G4KLX ROSE for Linux. 
Version 0.62 for AX25.037 Linux 2.4\n";

static char banner[] __initdata = KERN_INFO "G4KLX NET/ROM for Linux. 
Version 0.7 for AX25.037 Linux 2.4\n";

73 de Bernard, f6bvp

http://f6bvp.org
http://rose.fpac.free.fr/MINI-HOWTO/
http://rose.fpac.free.fr/MINI-HOWTO-FR/

Re: [PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces

[David S. Miller]

From: Bernard Pidoux <pidoux@ccr.jussieu.fr>
Date: Sun, 30 Apr 2006 21:34:32 +0200

> Ralf Baechle wrote :
> 
> > Convert all NET/ROM sysctl time values from jiffies to ms as units.
> > 
> > Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> > 
> 
> With such extensive patches for netrom and rose modules that will go 
> into a future 2.6.x kernel, I think it would be justified to update the 
> following banners in af_rose.c and af_netrom.c respectively for they 
> appear during boot :

It might be worthwhile to remove the messages altogether.

IPV4 and the core networking used to output similar initialization
log messages and it really doesn't really add anything but pollute
the already voluminous kernel log.

So I say we just remove it.

Re: [PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces

[Ralf Baechle]

On Sun, Apr 30, 2006 at 05:21:36PM -0700, David S. Miller wrote:

> > With such extensive patches for netrom and rose modules that will go 
> > into a future 2.6.x kernel, I think it would be justified to update the 
> > following banners in af_rose.c and af_netrom.c respectively for they 
> > appear during boot :
> 
> It might be worthwhile to remove the messages altogether.
> 
> IPV4 and the core networking used to output similar initialization
> log messages and it really doesn't really add anything but pollute
> the already voluminous kernel log.
> 
> So I say we just remove it.

Agreed, patch to remove the messages is below.

  Ralf

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

 net/netrom/af_netrom.c |    3 ---
 net/rose/af_rose.c     |    3 ---
 2 files changed, 6 deletions(-)

Index: linux-net.git/net/netrom/af_netrom.c
===================================================================
--- linux-net.git.orig/net/netrom/af_netrom.c	2006-04-30 10:28:32.000000000 +0100
+++ linux-net.git/net/netrom/af_netrom.c	2006-05-02 00:48:59.000000000 +0100
@@ -1370,8 +1370,6 @@ static struct notifier_block nr_dev_noti
 
 static struct net_device **dev_nr;
 
-static char banner[] __initdata = KERN_INFO "G4KLX NET/ROM for Linux. Version 0.7 for AX25.037 Linux 2.4\n";
-
 static int __init nr_proto_init(void)
 {
 	int i;
@@ -1419,7 +1417,6 @@ static int __init nr_proto_init(void)
 	}
 		
 	register_netdevice_notifier(&nr_dev_notifier);
-	printk(banner);
 
 	ax25_protocol_register(AX25_P_NETROM, nr_route_frame);
 	ax25_linkfail_register(nr_link_failed);
Index: linux-net.git/net/rose/af_rose.c
===================================================================
--- linux-net.git.orig/net/rose/af_rose.c	2006-04-30 13:29:58.000000000 +0100
+++ linux-net.git/net/rose/af_rose.c	2006-05-02 00:48:28.000000000 +0100
@@ -1469,8 +1469,6 @@ static struct notifier_block rose_dev_no
 
 static struct net_device **dev_rose;
 
-static const char banner[] = KERN_INFO "F6FBB/G4KLX ROSE for Linux. Version 0.62 for AX25.037 Linux 2.4\n";
-
 static int __init rose_proto_init(void)
 {
 	int i;
@@ -1519,7 +1517,6 @@ static int __init rose_proto_init(void)
 
 	sock_register(&rose_family_ops);
 	register_netdevice_notifier(&rose_dev_notifier);
-	printk(banner);
 
 	ax25_protocol_register(AX25_P_ROSE, rose_route_frame);
 	ax25_linkfail_register(rose_link_failed);

Re: [PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces

[David S. Miller]

From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 2 May 2006 00:52:35 +0100

> On Sun, Apr 30, 2006 at 05:21:36PM -0700, David S. Miller wrote:
> 
> > > With such extensive patches for netrom and rose modules that will go 
> > > into a future 2.6.x kernel, I think it would be justified to update the 
> > > following banners in af_rose.c and af_netrom.c respectively for they 
> > > appear during boot :
> > 
> > It might be worthwhile to remove the messages altogether.
> > 
> > IPV4 and the core networking used to output similar initialization
> > log messages and it really doesn't really add anything but pollute
> > the already voluminous kernel log.
> > 
> > So I say we just remove it.
> 
> Agreed, patch to remove the messages is below.
> 
>   Ralf
> 
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Applied, thanks a lot Ralf.

Re: [PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces

[David S. Miller]

From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 29 Apr 2006 15:16:13 +0100

> Convert all NET/ROM sysctl time values from jiffies to ms as units.
> 
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Applied.

[PATCH 2/3] Eleminate HZ from NET/ROM kernel interfaces

[Ralf Baechle DL5RB]

Convert all NET/ROM sysctl time values from jiffies to ms as units.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

 include/net/netrom.h   |    8 ++++----
 net/netrom/af_netrom.c |   15 ++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

Index: linux-cvs/include/net/netrom.h
===================================================================
--- linux-cvs.orig/include/net/netrom.h
+++ linux-cvs/include/net/netrom.h
@@ -42,11 +42,11 @@ enum {
 #define	NR_COND_PEER_RX_BUSY		0x04
 #define	NR_COND_OWN_RX_BUSY		0x08
 
-#define NR_DEFAULT_T1			(120 * HZ)	/* Outstanding frames - 120 seconds */
-#define NR_DEFAULT_T2			(5   * HZ)	/* Response delay     - 5 seconds */
+#define NR_DEFAULT_T1			120000		/* Outstanding frames - 120 seconds */
+#define NR_DEFAULT_T2			5000		/* Response delay     - 5 seconds */
 #define NR_DEFAULT_N2			3		/* Number of Retries - 3 */
-#define	NR_DEFAULT_T4			(180 * HZ)	/* Busy Delay - 180 seconds */
-#define	NR_DEFAULT_IDLE			(0 * 60 * HZ)	/* No Activity Timeout - none */
+#define	NR_DEFAULT_T4			180000		/* Busy Delay - 180 seconds */
+#define	NR_DEFAULT_IDLE			0		/* No Activity Timeout - none */
 #define	NR_DEFAULT_WINDOW		4		/* Default Window Size - 4 */
 #define	NR_DEFAULT_OBS			6		/* Default Obsolescence Count - 6 */
 #define	NR_DEFAULT_QUAL			10		/* Default Neighbour Quality - 10 */
Index: linux-cvs/net/netrom/af_netrom.c
===================================================================
--- linux-cvs.orig/net/netrom/af_netrom.c
+++ linux-cvs/net/netrom/af_netrom.c
@@ -424,11 +424,16 @@ static int nr_create(struct socket *sock
 
 	nr_init_timers(sk);
 
-	nr->t1     = sysctl_netrom_transport_timeout;
-	nr->t2     = sysctl_netrom_transport_acknowledge_delay;
-	nr->n2     = sysctl_netrom_transport_maximum_tries;
-	nr->t4     = sysctl_netrom_transport_busy_delay;
-	nr->idle   = sysctl_netrom_transport_no_activity_timeout;
+	nr->t1     =
+		msecs_to_jiffies(sysctl_netrom_transport_timeout);
+	nr->t2     =
+		msecs_to_jiffies(sysctl_netrom_transport_acknowledge_delay);
+	nr->n2     =
+		msecs_to_jiffies(sysctl_netrom_transport_maximum_tries);
+	nr->t4     =
+		msecs_to_jiffies(sysctl_netrom_transport_busy_delay);
+	nr->idle   =
+		msecs_to_jiffies(sysctl_netrom_transport_no_activity_timeout);
 	nr->window = sysctl_netrom_transport_requested_window_size;
 
 	nr->bpqext = 1;