提交 dca9b240 编写于 作者: S Shan Wei 提交者: David S. Miller

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: NShan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 b672083e
#ifndef _ADDRCONF_H #ifndef _ADDRCONF_H
#define _ADDRCONF_H #define _ADDRCONF_H
#define RETRANS_TIMER HZ
#define MAX_RTR_SOLICITATIONS 3 #define MAX_RTR_SOLICITATIONS 3
#define RTR_SOLICITATION_INTERVAL (4*HZ) #define RTR_SOLICITATION_INTERVAL (4*HZ)
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#define IP6_RT_PRIO_USER 1024 #define IP6_RT_PRIO_USER 1024
#define IP6_RT_PRIO_ADDRCONF 256 #define IP6_RT_PRIO_ADDRCONF 256
#define IP6_RT_PRIO_KERN 512
struct route_info { struct route_info {
__u8 type; __u8 type;
......
...@@ -42,9 +42,6 @@ enum { ...@@ -42,9 +42,6 @@ enum {
#define ND_REACHABLE_TIME (30*HZ) #define ND_REACHABLE_TIME (30*HZ)
#define ND_RETRANS_TIMER HZ #define ND_RETRANS_TIMER HZ
#define ND_MIN_RANDOM_FACTOR (1/2)
#define ND_MAX_RANDOM_FACTOR (3/2)
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/compiler.h> #include <linux/compiler.h>
......
...@@ -60,7 +60,6 @@ struct ipstats_mib { ...@@ -60,7 +60,6 @@ struct ipstats_mib {
}; };
/* ICMP */ /* ICMP */
#define ICMP_MIB_DUMMY __ICMP_MIB_MAX
#define ICMP_MIB_MAX __ICMP_MIB_MAX #define ICMP_MIB_MAX __ICMP_MIB_MAX
struct icmp_mib { struct icmp_mib {
unsigned long mibs[ICMP_MIB_MAX]; unsigned long mibs[ICMP_MIB_MAX];
......
...@@ -516,9 +516,6 @@ static __inline__ void sk_add_bind_node(struct sock *sk, ...@@ -516,9 +516,6 @@ static __inline__ void sk_add_bind_node(struct sock *sk,
#define sk_nulls_for_each_from(__sk, node) \ #define sk_nulls_for_each_from(__sk, node) \
if (__sk && ({ node = &(__sk)->sk_nulls_node; 1; })) \ if (__sk && ({ node = &(__sk)->sk_nulls_node; 1; })) \
hlist_nulls_for_each_entry_from(__sk, node, sk_nulls_node) 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) \ #define sk_for_each_safe(__sk, node, tmp, list) \
hlist_for_each_entry_safe(__sk, node, tmp, list, sk_node) hlist_for_each_entry_safe(__sk, node, tmp, list, sk_node)
#define sk_for_each_bound(__sk, node, list) \ #define sk_for_each_bound(__sk, node, list) \
......
...@@ -100,12 +100,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo); ...@@ -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 #define TCP_SYNACK_RETRIES 5 /* number of times to retry passive opening a
* connection: ~180sec is RFC minimum */ * 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 #define TCP_TIMEWAIT_LEN (60*HZ) /* how long to wait to destroy TIME-WAIT
* state, about 60 seconds */ * state, about 60 seconds */
#define TCP_FIN_TIMEOUT TCP_TIMEWAIT_LEN #define TCP_FIN_TIMEOUT TCP_TIMEWAIT_LEN
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册