2020-01-21 08:51:40

by Alex Shi

Subject: [PATCH] tcp/ipv4: remove AF_INET_FAMILY

After commit 079096f103fa ("tcp/dccp: install syn_recv requests into ehash table")
the macro isn't used anymore. remove it.

Signed-off-by: Alex Shi <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Alexey Kuznetsov <[email protected]>
Cc: Hideaki YOSHIFUJI <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
net/ipv4/inet_connection_sock.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 18c0d5bffe12..ca22073cd500 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -610,12 +610,6 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk,
}
EXPORT_SYMBOL_GPL(inet_csk_route_child_sock);

-#if IS_ENABLED(CONFIG_IPV6)
-#define AF_INET_FAMILY(fam) ((fam) == AF_INET)
-#else
-#define AF_INET_FAMILY(fam) true
-#endif
-
/* Decide when to expire the request and when to resend SYN-ACK */
static inline void syn_ack_recalc(struct request_sock *req, const int thresh,
const int max_retries,
--
1.8.3.1

2020-01-21 11:06:06

by David Miller

Subject: Re: [PATCH] tcp/ipv4: remove AF_INET_FAMILY

From: Alex Shi <[email protected]>
Date: Tue, 21 Jan 2020 16:50:07 +0800

> After commit 079096f103fa ("tcp/dccp: install syn_recv requests into ehash table")
> the macro isn't used anymore. remove it.
>
> Signed-off-by: Alex Shi <[email protected]>

Applied to net-next