Commit dca9b2404a6d6579828da2425c051462701efd3f

Authored by Shan Wei
Committed by David S. Miller
1 parent b672083ed3

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>

Showing 6 changed files with 0 additions and 16 deletions Side-by-side Diff

include/net/addrconf.h
1 1 #ifndef _ADDRCONF_H
2 2 #define _ADDRCONF_H
3 3  
4   -#define RETRANS_TIMER HZ
5   -
6 4 #define MAX_RTR_SOLICITATIONS 3
7 5 #define RTR_SOLICITATION_INTERVAL (4*HZ)
8 6  
include/net/ip6_route.h
... ... @@ -3,7 +3,6 @@
3 3  
4 4 #define IP6_RT_PRIO_USER 1024
5 5 #define IP6_RT_PRIO_ADDRCONF 256
6   -#define IP6_RT_PRIO_KERN 512
7 6  
8 7 struct route_info {
9 8 __u8 type;
... ... @@ -42,9 +42,6 @@
42 42 #define ND_REACHABLE_TIME (30*HZ)
43 43 #define ND_RETRANS_TIMER HZ
44 44  
45   -#define ND_MIN_RANDOM_FACTOR (1/2)
46   -#define ND_MAX_RANDOM_FACTOR (3/2)
47   -
48 45 #ifdef __KERNEL__
49 46  
50 47 #include <linux/compiler.h>
... ... @@ -60,7 +60,6 @@
60 60 };
61 61  
62 62 /* ICMP */
63   -#define ICMP_MIB_DUMMY __ICMP_MIB_MAX
64 63 #define ICMP_MIB_MAX __ICMP_MIB_MAX
65 64 struct icmp_mib {
66 65 unsigned long mibs[ICMP_MIB_MAX];
... ... @@ -516,9 +516,6 @@
516 516 #define sk_nulls_for_each_from(__sk, node) \
517 517 if (__sk && ({ node = &(__sk)->sk_nulls_node; 1; })) \
518 518 hlist_nulls_for_each_entry_from(__sk, node, sk_nulls_node)
519   -#define sk_for_each_continue(__sk, node) \
520   - if (__sk && ({ node = &(__sk)->sk_node; 1; })) \
521   - hlist_for_each_entry_continue(__sk, node, sk_node)
522 519 #define sk_for_each_safe(__sk, node, tmp, list) \
523 520 hlist_for_each_entry_safe(__sk, node, tmp, list, sk_node)
524 521 #define sk_for_each_bound(__sk, node, list) \
... ... @@ -100,12 +100,6 @@
100 100 #define TCP_SYNACK_RETRIES 5 /* number of times to retry passive opening a
101 101 * connection: ~180sec is RFC minimum */
102 102  
103   -
104   -#define TCP_ORPHAN_RETRIES 7 /* number of times to retry on an orphaned
105   - * socket. 7 is ~50sec-16min.
106   - */
107   -
108   -
109 103 #define TCP_TIMEWAIT_LEN (60*HZ) /* how long to wait to destroy TIME-WAIT
110 104 * state, about 60 seconds */
111 105 #define TCP_FIN_TIMEOUT TCP_TIMEWAIT_LEN