From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE704C433DF for ; Sat, 1 Aug 2020 02:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C03D720838 for ; Sat, 1 Aug 2020 02:09:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="BoOu3o9g" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728258AbgHACJd (ORCPT ); Fri, 31 Jul 2020 22:09:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726794AbgHACJd (ORCPT ); Fri, 31 Jul 2020 22:09:33 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C325C06174A for ; Fri, 31 Jul 2020 19:09:33 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id x10so21809523ybj.19 for ; Fri, 31 Jul 2020 19:09:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=a52V4Kdhy4rgB5aYktu9ijZu4cJb8Jp2kCo0109Mb1A=; b=BoOu3o9guxB8PhIKD0pKz8HNgp4bPriNfbuaxNzNq+GFUY5w81dxTMMY/e0Jl2ETnd RMlLRWXCOz/RXHzsHec9b4uDS8xpEyL/MbMNqB6YEn+m6Pns2R9t+iVYZFI0M+24jIGd JtHvY/xYnbEzVIB8YNjdnJ4Kk78hUD8G/WGxfi+ffGNBCVjpR40xvFsPbY6veJBoyePg 9gqqt2J9cer8tsmPDHqk30RDy8tWwElUpdcVMH3z+c9dR2of9Z9ERe8v0okwFobDfDSV f5Ncj5yGp8ozUn+NRSIYH3nHjejK2R3h5qwavNfwfuAnOiI1WF8WMBAf4OaMMtDL23g0 uy8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=a52V4Kdhy4rgB5aYktu9ijZu4cJb8Jp2kCo0109Mb1A=; b=L/jbM2i886WXJLsVvYpbYBTVpNbIWg8/imAd/B9hTLNy2GNQL335GR0jd37fff6aY8 cDcRaznr/ze4wnNhDaHpq7BojMymkbRfXTbjPJvs7ihyLwJ39yLEJ8gY+AOXdOFxR1zt ewkJhxlh5bPTCu66KbxTD4rZeJfFE0ohqIT8d1iL/YA6pFPNlopHA7Xo5OhXj+f8hIZT 1oj93OJxf3P3ejCOpBDmgIiCIzSHfMfSKM5NGa4zCxvLPeuZAPUTHk0r8eczVHcEIcLS xIdJAM21dSnot7vqyqamj1NNCngCU++Phngh6HbHE5X+I95+ygA+4Uk0WGLRk/jG+aJK M9/A== X-Gm-Message-State: AOAM531H3DgLQ0QcJeNudjLoN4Q+J0xIlJq6A+EHAQjx3FOOr9jsiZA1 apxl1VNP5qD9V5YLyE3C+6ur5FWD6GglAQ== X-Google-Smtp-Source: ABdhPJzwR7ozcjUz7S2lO1HXossFTaxUjhYMa231D1Aef0OGiL3T1I4aYCEC0EQjNkfmMmcV5Np6e46UKR6TCg== X-Received: by 2002:a25:38c5:: with SMTP id f188mr10171240yba.132.1596247772383; Fri, 31 Jul 2020 19:09:32 -0700 (PDT) Date: Fri, 31 Jul 2020 19:09:29 -0700 Message-Id: <20200801020929.3000802-1-edumazet@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6-goog Subject: [PATCH net-next] tcp: fix build fong CONFIG_MPTCP=n From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet , Florian Westphal Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes these errors: net/ipv4/syncookies.c: In function 'tcp_get_cookie_sock': net/ipv4/syncookies.c:216:19: error: 'struct tcp_request_sock' has no member named 'drop_req' 216 | if (tcp_rsk(req)->drop_req) { | ^~ net/ipv4/syncookies.c: In function 'cookie_tcp_reqsk_alloc': net/ipv4/syncookies.c:289:27: warning: unused variable 'treq' [-Wunused-variable] 289 | struct tcp_request_sock *treq; | ^~~~ make[3]: *** [scripts/Makefile.build:280: net/ipv4/syncookies.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Fixes: 9466a1ccebbe ("mptcp: enable JOIN requests even if cookies are in use") Signed-off-by: Eric Dumazet Cc: Florian Westphal --- net/ipv4/syncookies.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index 11b20474be8310d7070750a1c7b4013f2fba2f55..f0794f0232bae749244fff35d8b96b1f561a5e87 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c @@ -213,7 +213,7 @@ struct sock *tcp_get_cookie_sock(struct sock *sk, struct sk_buff *skb, tcp_sk(child)->tsoffset = tsoff; sock_rps_save_rxhash(child, skb); - if (tcp_rsk(req)->drop_req) { + if (rsk_drop_req(req)) { refcount_set(&req->rsk_refcnt, 2); return child; } @@ -286,10 +286,11 @@ struct request_sock *cookie_tcp_reqsk_alloc(const struct request_sock_ops *ops, struct sock *sk, struct sk_buff *skb) { - struct tcp_request_sock *treq; struct request_sock *req; #ifdef CONFIG_MPTCP + struct tcp_request_sock *treq; + if (sk_is_mptcp(sk)) ops = &mptcp_subflow_request_sock_ops; #endif -- 2.28.0.163.g6104cc2f0b6-goog