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 <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index a944124..23710aa 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -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)
 

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 67d154a..e06e0ca 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -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;

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 895997b..e0e594f 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -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>

diff --git a/include/net/snmp.h b/include/net/snmp.h
index aebb553..762e2ab 100644 (file)
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -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];

diff --git a/include/net/sock.h b/include/net/sock.h
index 5557dfb..717cfbf 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -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) \

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 4097320..3f227ba 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -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