diff options
author | Eric Dumazet <edumazet@google.com> | 2013-10-02 04:29:50 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-03 15:33:35 -0400 |
commit | 5080546682bae3d32734b18e281091684f0ebbe4 (patch) | |
tree | d83649361f75e4d053acfc1ac986dec5f273b4e4 /include/net/sock.h | |
parent | 7b4371ea48f03d3ac56df44f573e314f5b06939e (diff) | |
download | linux-stable-5080546682bae3d32734b18e281091684f0ebbe4.tar.gz linux-stable-5080546682bae3d32734b18e281091684f0ebbe4.tar.bz2 linux-stable-5080546682bae3d32734b18e281091684f0ebbe4.zip |
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/sock.h')
-rw-r--r-- | include/net/sock.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index f0a44cc1ff9d..e3bf213be625 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -300,6 +300,10 @@ struct sock { #define sk_dontcopy_begin __sk_common.skc_dontcopy_begin #define sk_dontcopy_end __sk_common.skc_dontcopy_end #define sk_hash __sk_common.skc_hash +#define sk_portpair __sk_common.skc_portpair +#define sk_addrpair __sk_common.skc_addrpair +#define sk_daddr __sk_common.skc_daddr +#define sk_rcv_saddr __sk_common.skc_rcv_saddr #define sk_family __sk_common.skc_family #define sk_state __sk_common.skc_state #define sk_reuse __sk_common.skc_reuse |