Skip to contentSkip to conversation

net: kill unused macros

PATCH Applied Shan Wei 2 participants 2 messages Dec 15, 2010 – Dec 20, 2010

Subsystems (5)
Networking Network drivers TCP ATM +1 more subsystems
lore
Share & tools
lore

Shan Wei

author
#0 lore raw

PATCH 1/3 net: kill unused macros

These macros never be used, so remove them.

---
Include these changes to a patch for only netdev maillist, Although these belong to different subsys.

---
 include/net/inet_connection_sock.h |    1 -
 include/net/tcp.h                  |    2 --
 net/atm/mpc.c                      |    2 --
 net/core/neighbour.c               |    1 -
 net/core/netpoll.c                 |    1 -
 net/netlabel/netlabel_cipso_v4.h   |    1 -
 net/netlabel/netlabel_mgmt.h       |    1 -
 net/netlabel/netlabel_unlabeled.h  |    1 -
 8 files changed, 0 insertions(+), 10 deletions(-)
include/net/inet_connection_sock.h +0 -1
index 6c93a56..6ac4e3b 100644
@@ -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)
 {
include/net/tcp.h +0 -2
index 3f227ba..bd3c377 100644
@@ -1152,8 +1152,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,
net/atm/mpc.c +0 -2
index 74bcc66..644cdf0 100644
@@ -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);
net/core/neighbour.c +0 -1
index 8cc8f9a..60a9029 100644
@@ -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
 
net/core/netpoll.c +0 -1
index ee38acb..72d9b50 100644
@@ -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;
 
net/netlabel/netlabel_cipso_v4.h +0 -1
index c8a4079..af7f335 100644
@@ -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 {
net/netlabel/netlabel_mgmt.h +0 -1
index 05d9643..0a25838 100644
@@ -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 {
net/netlabel/netlabel_unlabeled.h +0 -1
index 7aba635..0bc8dc3 100644
@@ -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 {
Signature · 1 line
1.6.3.3