Skip to contentSkip to conversation

net: kill unused macros in head file

PATCH In review Shan Wei 3 participants 4 messages Nov 29, 2010 – Dec 1, 2010

Subsystems (5)
Networking Network drivers IPv4/IPv6 TCP +1 more subsystems
lore
Share & tools
lore

Shan Wei

author
#0 lore raw

PATCH 1/3 net: kill unused macros in head file

These macros have been defined for several years since v2.6.12-rc2（tracing by git）, but never be used. So remove them.

Signed-off-by Shan Wei <[email protected]>
---
 include/net/addrconf.h  |    2 --
 include/net/ip6_route.h |    1 -
 include/net/ndisc.h     |    6 ------
 include/net/snmp.h      |    1 -
 include/net/sock.h      |    3 ---
 include/net/tcp.h       |    6 ------
 6 files changed, 0 insertions(+), 19 deletions(-)
include/net/addrconf.h +0 -2
index a944124..23710aa 100644
@@ -1,8 +1,6 @@
 #ifndef _ADDRCONF_H
 #define _ADDRCONF_H
 
-#define RETRANS_TIMER	HZ
-
 #define MAX_RTR_SOLICITATIONS		3
 #define RTR_SOLICITATION_INTERVAL	(4*HZ)
include/net/ip6_route.h +0 -1
index 278312c..52c0550 100644
@@ -3,7 +3,6 @@
 
 #define IP6_RT_PRIO_USER	1024
 #define IP6_RT_PRIO_ADDRCONF	256
-#define IP6_RT_PRIO_KERN	512
 
 struct route_info {
 	__u8			type;
include/net/ndisc.h +0 -6
index 895997b..f134987 100644
@@ -39,12 +39,6 @@ enum {
 
 #define MAX_RTR_SOLICITATION_DELAY	HZ
 
-#define ND_REACHABLE_TIME		(30*HZ)
-#define ND_RETRANS_TIMER		HZ
-
-#define ND_MIN_RANDOM_FACTOR		(1/2)
-#define ND_MAX_RANDOM_FACTOR		(3/2)
-
 #ifdef __KERNEL__
 
 #include <linux/compiler.h>
include/net/snmp.h +0 -1
index a0e6180..835c587 100644
@@ -60,7 +60,6 @@ struct ipstats_mib {
 };
 
 /* ICMP */
-#define ICMP_MIB_DUMMY	__ICMP_MIB_MAX
 #define ICMP_MIB_MAX	(__ICMP_MIB_MAX + 1)
 
 struct icmp_mib {
include/net/sock.h +0 -3
index 5557dfb..717cfbf 100644
@@ -516,9 +516,6 @@ static __inline__ void sk_add_bind_node(struct sock *sk,
 #define sk_nulls_for_each_from(__sk, node) \
 	if (__sk && ({ node = &(__sk)->sk_nulls_node; 1; })) \
 		hlist_nulls_for_each_entry_from(__sk, node, sk_nulls_node)
-#define sk_for_each_continue(__sk, node) \
-	if (__sk && ({ node = &(__sk)->sk_node; 1; })) \
-		hlist_for_each_entry_continue(__sk, node, sk_node)
 #define sk_for_each_safe(__sk, node, tmp, list) \
 	hlist_for_each_entry_safe(__sk, node, tmp, list, sk_node)
 #define sk_for_each_bound(__sk, node, list) \
include/net/tcp.h +0 -6
index e36c874..ea819cc 100644
@@ -100,12 +100,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCP_SYNACK_RETRIES 5	/* number of times to retry passive opening a
 				 * connection: ~180sec is RFC minimum	*/
 
-
-#define TCP_ORPHAN_RETRIES 7	/* number of times to retry on an orphaned
-				 * socket. 7 is ~50sec-16min.
-				 */
-
-
 #define TCP_TIMEWAIT_LEN (60*HZ) /* how long to wait to destroy TIME-WAIT
 				  * state, about 60 seconds	*/
 #define TCP_FIN_TIMEOUT	TCP_TIMEWAIT_LEN
Signature · 1 line
1.6.3.3
#1 lore raw
Quoted 19 lines · Shan Wei

These macros have been defined for several years since v2.6.12-rc2（tracing by git）, but never be used. So remove them.

Signed-off-by Shan Wei <[email protected]>
---
 include/net/addrconf.h  |    2 --
 include/net/ip6_route.h |    1 -
 include/net/ndisc.h     |    6 ------
 include/net/snmp.h      |    1 -
 include/net/sock.h      |    3 ---
 include/net/tcp.h       |    6 ------
 6 files changed, 0 insertions(+), 19 deletions(-)
include/net/addrconf.h +0 -0
index a944124..23710aa 100644

include/net/addrconf.h line 6

Quoted 8 lines
include/net/addrconf.h +0 -2
@@ -1,8 +1,6 @@
 #ifndef _ADDRCONF_H
 #define _ADDRCONF_H
 
-#define RETRANS_TIMER	HZ
-
 #define MAX_RTR_SOLICITATIONS		3
 #define RTR_SOLICITATION_INTERVAL	(4*HZ)

I think we should use it in net/ipv6/addrconf.c,
instead of magic number.

include/net/ndisc.h enum { · line 43

Quoted 10 lines
include/net/ndisc.h +0 -2
index 895997b..f134987 100644
@@ -39,12 +39,6 @@ enum {
 
 #define MAX_RTR_SOLICITATION_DELAY	HZ
 
-#define ND_REACHABLE_TIME		(30*HZ)
-#define ND_RETRANS_TIMER		HZ

ditto (in net/ipv6/ndisc.c)

--yoshfuji

author
#2 lore raw

Hi yoshifuji-san:

YOSHIFUJI Hideaki wrote, at 11/29/2010 03:42 PM:

Quoted 9 lines

include/net/addrconf.h line 5

Quoted 6 lines
include/net/addrconf.h +0 -2
-#define RETRANS_TIMER	HZ
-
 #define MAX_RTR_SOLICITATIONS		3
 #define RTR_SOLICITATION_INTERVAL	(4*HZ)

I think we should use it in net/ipv6/addrconf.c,
instead of magic number.

Do you mean to replace all HZ in net/ipv6/addrconf.c with RETRANS_TIMER?

HZ is also a macro. And I think HZ is more easier to read than RETRANS_TIMER.

Signature · 3 lines
Best Regards
-----
Shan Wei
maintainer
#3 lore raw

From: Shan Wei <[email protected]>
Date: Mon, 29 Nov 2010 16:21:14 +0800

Quoted 13 lines

Hi yoshifuji-san:

YOSHIFUJI Hideaki wrote, at 11/29/2010 03:42 PM:

Quoted 9 lines

include/net/addrconf.h line 5

Quoted 6 lines
include/net/addrconf.h +0 -2
-#define RETRANS_TIMER	HZ
-
 #define MAX_RTR_SOLICITATIONS		3
 #define RTR_SOLICITATION_INTERVAL	(4*HZ)

I think we should use it in net/ipv6/addrconf.c,
instead of magic number.

Quoted 3 lines

Do you mean to replace all HZ in net/ipv6/addrconf.c with RETRANS_TIMER?

HZ is also a macro. And I think HZ is more easier to read than RETRANS_TIMER.

These things currently say "1 * HZ" and "30 * HZ", so I think Hideaki's request is reasonable.