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>

diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 6c93a56cc958a552143c01c1c2108ce3b0333738..6ac4e3b5007fc56f7f6b417b0f255ead9ab88264 100644 (file)
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -132,7 +132,6 @@ struct inet_connection_sock {
 #define ICSK_TIME_RETRANS      1       /* Retransmit timer */
 #define ICSK_TIME_DACK         2       /* Delayed ack timer */
 #define ICSK_TIME_PROBE0       3       /* Zero window probe timer */
-#define ICSK_TIME_KEEPOPEN     4       /* Keepalive timer */
 
 static inline struct inet_connection_sock *inet_csk(const struct sock *sk)
 {

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 2ab6c9c1c53a9cc326ce3a818ee5c1b7182bdb78..b4480300cadf51fd4beaa23d2d139df3b5de3fe0 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1158,8 +1158,6 @@ struct tcp_md5sig_pool {
        union tcp_md5sum_block  md5_blk;
 };
 
-#define TCP_MD5SIG_MAXKEYS     (~(u32)0)       /* really?! */
-
 /* - functions */
 extern int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,
                               struct sock *sk, struct request_sock *req,

diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 74bcc662c3dd8c5e7ec33a393560cc9bbf313b57..644cdf07164211b007d10e40918486497efe93c5 100644 (file)
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -64,8 +64,6 @@
        do { if (0) printk(KERN_CONT format, ##args); } while (0)
 #endif
 
-#define MPOA_TAG_LEN 4
-
 /* mpc_daemon -> kernel */
 static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc);
 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 8cc8f9a79db91fe20a86ad46b0199c3e98ebe8ac..60a902913429c60ce56a77ba779fb70e65247414 100644 (file)
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -41,7 +41,6 @@
 
 #define NEIGH_PRINTK(x...) printk(x)
 #define NEIGH_NOPRINTK(x...) do { ; } while(0)
-#define NEIGH_PRINTK0 NEIGH_PRINTK
 #define NEIGH_PRINTK1 NEIGH_NOPRINTK
 #define NEIGH_PRINTK2 NEIGH_NOPRINTK
 

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index ee38acb6d4632fbb4c766ad666fe4b5187535034..72d9b50109fc812bb161053d49a25a852cc792a3 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -35,7 +35,6 @@
 
 #define MAX_UDP_CHUNK 1460
 #define MAX_SKBS 32
-#define MAX_QUEUE_DEPTH (MAX_SKBS / 2)
 
 static struct sk_buff_head skb_pool;
 

diff --git a/net/netlabel/netlabel_cipso_v4.h b/net/netlabel/netlabel_cipso_v4.h
index c8a4079261f04a88147695554865bab3765ce3bd..af7f3355103e25ace814afdb08e9134620e8ce5e 100644 (file)
--- a/net/netlabel/netlabel_cipso_v4.h
+++ b/net/netlabel/netlabel_cipso_v4.h
@@ -107,7 +107,6 @@ enum {
        NLBL_CIPSOV4_C_LISTALL,
        __NLBL_CIPSOV4_C_MAX,
 };
-#define NLBL_CIPSOV4_C_MAX (__NLBL_CIPSOV4_C_MAX - 1)
 
 /* NetLabel CIPSOv4 attributes */
 enum {

diff --git a/net/netlabel/netlabel_mgmt.h b/net/netlabel/netlabel_mgmt.h
index 05d96431f81984061b575fd6adbad5c5de2ced19..0a25838bcf4567477654f2289ca4d3acff3bbb24 100644 (file)
--- a/net/netlabel/netlabel_mgmt.h
+++ b/net/netlabel/netlabel_mgmt.h
@@ -173,7 +173,6 @@ enum {
        NLBL_MGMT_C_VERSION,
        __NLBL_MGMT_C_MAX,
 };
-#define NLBL_MGMT_C_MAX (__NLBL_MGMT_C_MAX - 1)
 
 /* NetLabel Management attributes */
 enum {

diff --git a/net/netlabel/netlabel_unlabeled.h b/net/netlabel/netlabel_unlabeled.h
index 7aba63595137104ff1f3718816062fd11de234fa..0bc8dc3f9e3cbdb74c8d846fc919904ada484b6f 100644 (file)
--- a/net/netlabel/netlabel_unlabeled.h
+++ b/net/netlabel/netlabel_unlabeled.h
@@ -180,7 +180,6 @@ enum {
        NLBL_UNLABEL_C_STATICLISTDEF,
        __NLBL_UNLABEL_C_MAX,
 };
-#define NLBL_UNLABEL_C_MAX (__NLBL_UNLABEL_C_MAX - 1)
 
 /* NetLabel Unlabeled attributes */
 enum {