summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorShan Wei <shanwei@cn.fujitsu.com>2010-12-20 06:59:35 +0100
committerDavid S. Miller <davem@davemloft.net>2010-12-20 06:59:35 +0100
commit4c306a9291a077879fc3e933326caac3bc319caa (patch)
tree19704486012ac148ef37005ea38b9c2ae3442fc1 /include/net
parentvxge: add missing flush of reset_task (diff)
downloadlinux-4c306a9291a077879fc3e933326caac3bc319caa.tar.xz
linux-4c306a9291a077879fc3e933326caac3bc319caa.zip
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>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/inet_connection_sock.h1
-rw-r--r--include/net/tcp.h2
2 files changed, 0 insertions, 3 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 {
#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 2ab6c9c1c53a..b4480300cadf 100644
--- 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,