diff options
author | Eric Dumazet <edumazet@google.com> | 2013-10-02 15:29:50 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-03 23:33:35 +0400 |
commit | 5080546682bae3d32734b18e281091684f0ebbe4 (patch) | |
tree | d83649361f75e4d053acfc1ac986dec5f273b4e4 /include/net/inet_sock.h | |
parent | 7b4371ea48f03d3ac56df44f573e314f5b06939e (diff) | |
download | linux-5080546682bae3d32734b18e281091684f0ebbe4.tar.xz |
inet: consolidate INET_TW_MATCH
TCP listener refactoring, part 2 :
We can use a generic lookup, sockets being in whatever state, if
we are sure all relevant fields are at the same place in all socket
types (ESTABLISH, TIME_WAIT, SYN_RECV)
This patch removes these macros :
inet_addrpair, inet_addrpair, tw_addrpair, tw_portpair
And adds :
sk_portpair, sk_addrpair, sk_daddr, sk_rcv_saddr
Then, INET_TW_MATCH() is really the same than INET_MATCH()
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_sock.h')
-rw-r--r-- | include/net/inet_sock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index f3141773c14d..6d9a7e6eb5a4 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -146,10 +146,8 @@ struct inet_sock { /* Socket demultiplex comparisons on incoming packets. */ #define inet_daddr sk.__sk_common.skc_daddr #define inet_rcv_saddr sk.__sk_common.skc_rcv_saddr -#define inet_addrpair sk.__sk_common.skc_addrpair #define inet_dport sk.__sk_common.skc_dport #define inet_num sk.__sk_common.skc_num -#define inet_portpair sk.__sk_common.skc_portpair __be32 inet_saddr; __s16 uc_ttl; |