Skip to contentSkip to conversation

net: kill unused macros from head file

PATCH Applied Shan Wei 2 participants 2 messages Dec 2, 2010

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

Shan Wei

author
#0 lore raw

PATCH v2 4/4 net: kill unused macros from 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]>

---
To yoshifuji-san:
I can't find any magic number in net/ipv6/addrconf.c can be replaced by RETRANS_TIMER.

---
 include/net/addrconf.h  |    2 --
 include/net/ip6_route.h |    1 -
 include/net/ndisc.h     |    3 ---
 include/net/snmp.h      |    1 -
 include/net/sock.h      |    3 ---
 include/net/tcp.h       |    6 ------
 6 files changed, 0 insertions(+), 16 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 -3
index 895997b..e0e594f 100644
@@ -42,9 +42,6 @@ enum {
 #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 aebb553..762e2ab 100644
@@ -60,7 +60,6 @@ struct ipstats_mib {
 };
 
 /* ICMP */
-#define ICMP_MIB_DUMMY	__ICMP_MIB_MAX
 #define ICMP_MIB_MAX	__ICMP_MIB_MAX
 struct icmp_mib {
 	unsigned long	mibs[ICMP_MIB_MAX];
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