diff options
author | Shan Wei <shanwei@cn.fujitsu.com> | 2010-12-20 00:59:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-20 00:59:35 -0500 |
commit | 4c306a9291a077879fc3e933326caac3bc319caa (patch) | |
tree | 19704486012ac148ef37005ea38b9c2ae3442fc1 | |
parent | ba27d85c96c57111ae8acfa959643e5ce8e4bcbe (diff) |
net: kill unused macros
These macros never be used, so remove them.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/inet_connection_sock.h | 1 | ||||
-rw-r--r-- | include/net/tcp.h | 2 | ||||
-rw-r--r-- | net/atm/mpc.c | 2 | ||||
-rw-r--r-- | net/core/neighbour.c | 1 | ||||
-rw-r--r-- | net/core/netpoll.c | 1 | ||||
-rw-r--r-- | net/netlabel/netlabel_cipso_v4.h | 1 | ||||
-rw-r--r-- | net/netlabel/netlabel_mgmt.h | 1 | ||||
-rw-r--r-- | net/netlabel/netlabel_unlabeled.h | 1 |
8 files changed, 0 insertions, 10 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index 6c93a56cc958..6ac4e3b5007f 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h | |||
@@ -132,7 +132,6 @@ struct inet_connection_sock { | |||
132 | #define ICSK_TIME_RETRANS 1 /* Retransmit timer */ | 132 | #define ICSK_TIME_RETRANS 1 /* Retransmit timer */ |
133 | #define ICSK_TIME_DACK 2 /* Delayed ack timer */ | 133 | #define ICSK_TIME_DACK 2 /* Delayed ack timer */ |
134 | #define ICSK_TIME_PROBE0 3 /* Zero window probe timer */ | 134 | #define ICSK_TIME_PROBE0 3 /* Zero window probe timer */ |
135 | #define ICSK_TIME_KEEPOPEN 4 /* Keepalive timer */ | ||
136 | 135 | ||
137 | static inline struct inet_connection_sock *inet_csk(const struct sock *sk) | 136 | static inline struct inet_connection_sock *inet_csk(const struct sock *sk) |
138 | { | 137 | { |
diff --git a/include/net/tcp.h b/include/net/tcp.h index 2ab6c9c1c53a..b4480300cadf 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -1158,8 +1158,6 @@ struct tcp_md5sig_pool { | |||
1158 | union tcp_md5sum_block md5_blk; | 1158 | union tcp_md5sum_block md5_blk; |
1159 | }; | 1159 | }; |
1160 | 1160 | ||
1161 | #define TCP_MD5SIG_MAXKEYS (~(u32)0) /* really?! */ | ||
1162 | |||
1163 | /* - functions */ | 1161 | /* - functions */ |
1164 | extern int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key, | 1162 | extern int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key, |
1165 | struct sock *sk, struct request_sock *req, | 1163 | struct sock *sk, struct request_sock *req, |
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 74bcc662c3dd..644cdf071642 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
@@ -64,8 +64,6 @@ | |||
64 | do { if (0) printk(KERN_CONT format, ##args); } while (0) | 64 | do { if (0) printk(KERN_CONT format, ##args); } while (0) |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #define MPOA_TAG_LEN 4 | ||
68 | |||
69 | /* mpc_daemon -> kernel */ | 67 | /* mpc_daemon -> kernel */ |
70 | static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc); | 68 | static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc); |
71 | static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc); | 69 | static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc); |
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 8cc8f9a79db9..60a902913429 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | #define NEIGH_PRINTK(x...) printk(x) | 42 | #define NEIGH_PRINTK(x...) printk(x) |
43 | #define NEIGH_NOPRINTK(x...) do { ; } while(0) | 43 | #define NEIGH_NOPRINTK(x...) do { ; } while(0) |
44 | #define NEIGH_PRINTK0 NEIGH_PRINTK | ||
45 | #define NEIGH_PRINTK1 NEIGH_NOPRINTK | 44 | #define NEIGH_PRINTK1 NEIGH_NOPRINTK |
46 | #define NEIGH_PRINTK2 NEIGH_NOPRINTK | 45 | #define NEIGH_PRINTK2 NEIGH_NOPRINTK |
47 | 46 | ||
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index ee38acb6d463..72d9b50109fc 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #define MAX_UDP_CHUNK 1460 | 36 | #define MAX_UDP_CHUNK 1460 |
37 | #define MAX_SKBS 32 | 37 | #define MAX_SKBS 32 |
38 | #define MAX_QUEUE_DEPTH (MAX_SKBS / 2) | ||
39 | 38 | ||
40 | static struct sk_buff_head skb_pool; | 39 | static struct sk_buff_head skb_pool; |
41 | 40 | ||
diff --git a/net/netlabel/netlabel_cipso_v4.h b/net/netlabel/netlabel_cipso_v4.h index c8a4079261f0..af7f3355103e 100644 --- a/net/netlabel/netlabel_cipso_v4.h +++ b/net/netlabel/netlabel_cipso_v4.h | |||
@@ -107,7 +107,6 @@ enum { | |||
107 | NLBL_CIPSOV4_C_LISTALL, | 107 | NLBL_CIPSOV4_C_LISTALL, |
108 | __NLBL_CIPSOV4_C_MAX, | 108 | __NLBL_CIPSOV4_C_MAX, |
109 | }; | 109 | }; |
110 | #define NLBL_CIPSOV4_C_MAX (__NLBL_CIPSOV4_C_MAX - 1) | ||
111 | 110 | ||
112 | /* NetLabel CIPSOv4 attributes */ | 111 | /* NetLabel CIPSOv4 attributes */ |
113 | enum { | 112 | enum { |
diff --git a/net/netlabel/netlabel_mgmt.h b/net/netlabel/netlabel_mgmt.h index 05d96431f819..0a25838bcf45 100644 --- a/net/netlabel/netlabel_mgmt.h +++ b/net/netlabel/netlabel_mgmt.h | |||
@@ -173,7 +173,6 @@ enum { | |||
173 | NLBL_MGMT_C_VERSION, | 173 | NLBL_MGMT_C_VERSION, |
174 | __NLBL_MGMT_C_MAX, | 174 | __NLBL_MGMT_C_MAX, |
175 | }; | 175 | }; |
176 | #define NLBL_MGMT_C_MAX (__NLBL_MGMT_C_MAX - 1) | ||
177 | 176 | ||
178 | /* NetLabel Management attributes */ | 177 | /* NetLabel Management attributes */ |
179 | enum { | 178 | enum { |
diff --git a/net/netlabel/netlabel_unlabeled.h b/net/netlabel/netlabel_unlabeled.h index 7aba63595137..0bc8dc3f9e3c 100644 --- a/net/netlabel/netlabel_unlabeled.h +++ b/net/netlabel/netlabel_unlabeled.h | |||
@@ -180,7 +180,6 @@ enum { | |||
180 | NLBL_UNLABEL_C_STATICLISTDEF, | 180 | NLBL_UNLABEL_C_STATICLISTDEF, |
181 | __NLBL_UNLABEL_C_MAX, | 181 | __NLBL_UNLABEL_C_MAX, |
182 | }; | 182 | }; |
183 | #define NLBL_UNLABEL_C_MAX (__NLBL_UNLABEL_C_MAX - 1) | ||
184 | 183 | ||
185 | /* NetLabel Unlabeled attributes */ | 184 | /* NetLabel Unlabeled attributes */ |
186 | enum { | 185 | enum { |