Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3457032ybl; Tue, 21 Jan 2020 00:51:40 -0800 (PST) X-Google-Smtp-Source: APXvYqxLr5ua2cx6PHsH6AqEnkBHcXBYH2IHUTuWy5v70TcAsybtiOgikEezGPH8vjFhZuE7d/Bl X-Received: by 2002:a05:6830:1e1c:: with SMTP id s28mr2722688otr.335.1579596700514; Tue, 21 Jan 2020 00:51:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579596700; cv=none; d=google.com; s=arc-20160816; b=l+yn4hUkmJ5Sx5uFIERSJnWz3ua4W77kGZkV5KqhJ4EugjN/otl8Wf32hWYYiYU1c5 ILLqECxpDrCT4VW/3kU2FvtVHaqtyWx3H07HdCdDZS6VM6RZIvp6vb67erUnHxw1altD i0wClg7jEzsOirRK8xFR9tdX0HhkbS1SoBQQtIJ9TXl4bCKyfpbswz9MlqAL1O06cdzM rq4btIP2c3ZkPCnH1TuuBEAgd+FSSYD/n7gh78otG3wO8ds6Wiv5TDwYDZbABd9Ft2GT dEGi2DsLCyEGutzN3rlax556OTMPJnYQJSeuD7/te2j6wex+YQtxXPumBcmNH1IBkbR1 WAjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:message-id:date:subject:cc:from; bh=e9bRShVmJiCHZUgFj+g/m87OZogWlAIIf+lDym53x4w=; b=BCcYr/SeZnTlA+HmGXgXXQo24GMCgrB9R1v/eCJD4z7RdJLIl9VH0g12OhEDcxStEm 8gW5i8B5c8HLnvi4toxP4TLfiGQq+y1HEuuOL+yM5avvyoaGnI0xxSIBtJM4DQaBPa4L lUtYcL7LBTRkRfUmADpd6hSpwnIRMCpPX1+czqO3iQZXsXQtgeoWYdyyZ5wuAVdYkI70 nnOJvNeLqIJfdNsyAfgNGAaFvvpFTB6YNmnw0SnKjSi4DowPrEHPWhZBKVygehZJ7nYu 4593gKhKveyJYbcISXhLpn4aKO4vg3q5/tfGSPPb/yUDpLIARlAEE7Xqq5boQTafRTaM 2QPQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r202si19594454oie.247.2020.01.21.00.51.28; Tue, 21 Jan 2020 00:51:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729331AbgAUIuM (ORCPT + 99 others); Tue, 21 Jan 2020 03:50:12 -0500 Received: from out30-56.freemail.mail.aliyun.com ([115.124.30.56]:60457 "EHLO out30-56.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728783AbgAUIuK (ORCPT ); Tue, 21 Jan 2020 03:50:10 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R861e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04455;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0ToHY.4t_1579596608; Received: from localhost(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0ToHY.4t_1579596608) by smtp.aliyun-inc.com(127.0.0.1); Tue, 21 Jan 2020 16:50:09 +0800 From: Alex Shi Cc: "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] tcp/ipv4: remove AF_INET_FAMILY Date: Tue, 21 Jan 2020 16:50:07 +0800 Message-Id: <1579596607-258481-1-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: Hideaki YOSHIFUJI Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- 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