Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp780551rda; Sun, 22 Oct 2023 09:21:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHfvN8c7d8YVNAoOub3Qcoxmso6TKR6nPo/fXvKHufw9RSQxjhIi1xaaWyjKyq7yyr6cR3Z X-Received: by 2002:a05:6808:17a3:b0:3a7:4987:d44 with SMTP id bg35-20020a05680817a300b003a749870d44mr8535537oib.20.1697991704870; Sun, 22 Oct 2023 09:21:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991704; cv=none; d=google.com; s=arc-20160816; b=e3bEtDDBwTwGoM9H98dnu6r63dlGkLqfqVMU6/4nZCp/jYbo1Nu0nemSlaXy0w2QjB MKouwWe/GxmTGkLCuzb5e7g4hoGREq34GJKk5xWrPRvR7dNjINHPokbJmsXb+/n1GY56 8V7r/pTXcdG92OjFWZ82G6jcIca+PMG8eX5AaWWmrGRXx5ROCdtQfNaoJ/6V5yZjpyNo wuSgAtA01lmHU0JSvssGLEmHiK0tQTN6BHi6YduvDZItQNftE80Je8CPdRGBaTHKP7a1 h92nojaf0+kTk01G4eRzL78lzKDCDamF2yNsQU/1rp0+qxuBXYpSc4oZC+C96ljF4G7r vfOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=q3eUP6wW7BMqU4z5aN2e2S0C74STyHyYsk0Wx3zx7Fc=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=X7eLz35l5Nf9Om7hfb3vkAc0IkNehpomp6V283kIBDRCZhkjX149aQ2+38rbGYhpMn DEDsdUpnvt61uvf0Zzp5m+DlPgMdMct3b/C+h1dwQk8uMlo/tgDiZQS7XXGeitdTsyhh ZbVk1/iwmbQxFMWRRLU+Y04PjsAGwCO3NAoYrX0m5mmir09QrvB7zehlKCO5vz4egsnx 0GZg6jE9Kkbix5wNGv2xb7Vv3hZYyrxZKXNTBwOKRgBXOuHkebI5Z/u+I1EHRBj9LkKl ssCLQrPv1R4386tW3LGPKomdAYpQjc8oEvup9U+35aGDScknQB93yOjMdwPCIIH10ak5 AFWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NB5qujsP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id g28-20020a63375c000000b00585a454179fsi4934460pgn.162.2023.10.22.09.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NB5qujsP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 0BE4080560C4; Sun, 22 Oct 2023 09:21:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232468AbjJVQVM (ORCPT + 99 others); Sun, 22 Oct 2023 12:21:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232711AbjJVQVB (ORCPT ); Sun, 22 Oct 2023 12:21:01 -0400 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE5FB197; Sun, 22 Oct 2023 09:20:55 -0700 (PDT) Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-1dd71c0a41fso1937190fac.2; Sun, 22 Oct 2023 09:20:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991654; x=1698596454; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=q3eUP6wW7BMqU4z5aN2e2S0C74STyHyYsk0Wx3zx7Fc=; b=NB5qujsPEKObiA4r2K/tZFDisjEdeLRvf6pjMQ/G0U4HMlKkTJ4k2hieOvkJXQA739 0958QWJhR973Ymopjl3t+ChwwU/3axT+/4/slAuzrunLu6HSmpvf8wy4/iJ147cubwIa F529COGDB+cR46cp/aMVvr1nzklJJg2kUxBLDR5oWwIC/gF5GCISbjvpMAAzP7+zeR/s jqMR2Zj2GuPP+60aRW28VQB/A6To34JmrQYO58A104KlF66Pf3me536lEt4cX4upZa7h mnHd5qZhiYK1oHCNnNAkxUjaqoGNdOJvsSmNkpMW/4xN003ANcVESuaJJC6L5RsTnxxf F8Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991654; x=1698596454; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=q3eUP6wW7BMqU4z5aN2e2S0C74STyHyYsk0Wx3zx7Fc=; b=PIYT5ZjYbpSQBbp4T3KlMgIry/NEkp/yIrK4HSPLnTKTKzXH/cRgw/4YHe0k9QPbwb fgB7nwSNkPexkRa1gX5kxee7nLqTmGoMkSwGxx1Bzry4SM1kTjx7lYT8S0q9oX11IMP2 8mkaXp+Ov7B55dK/irt5aAbRNzitpJf0fNOct5spDgQH9lkcnLZoIFYc6N6PT5rL89Ej lYSLkRG1xaz/Sv8HA+WCNUsBhi9aoJzKr9B8yDl1gPH5qIWnx/Lz9gGGly7SQ/tZzEU8 EeOUByVMqKYAX45qOphLepanJ+6m5PaN7iGP1721nDSaDs36704/53yzVE2oHGzYPkF1 szdw== X-Gm-Message-State: AOJu0YzAePUf72aHh94uRhRLuEB8FiafzGjhDi7QyfRNiOsKdFajyZW9 KVeAXy/pX9s5lInmm298ae/oL/6iVhZsynZg X-Received: by 2002:a05:6870:57:b0:1e9:bb7b:6dd0 with SMTP id 23-20020a056870005700b001e9bb7b6dd0mr7603909oaz.55.1697991654564; Sun, 22 Oct 2023 09:20:54 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id h12-20020a05620a10ac00b00765ab6d3e81sm2108047qkk.122.2023.10.22.09.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:54 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:53 -0400 From: Oliver Crumrine To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 09/17] Change instances of cork to a pointer Message-ID: <37fb362cff69dc98dcd1a8bcaab0560964120117.1697989543.git.ozlinuxc@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 22 Oct 2023 09:21:40 -0700 (PDT) Make these usages of the cork a pointer in accordance with the previous patches. Signed-off-by: Oliver Crumrine --- net/ipv4/inet_connection_sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 394a498c2823..99eb394ba0a3 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -830,7 +830,7 @@ struct dst_entry *inet_csk_route_child_sock(const struct sock *sk, struct rtable *rt; opt = rcu_dereference(ireq->ireq_opt); - fl4 = &newinet->cork.fl.u.ip4; + fl4 = &newinet->cork->fl.u.ip4; flowi4_init_output(fl4, ireq->ir_iif, ireq->ir_mark, ip_sock_rt_tos(sk), ip_sock_rt_scope(sk), @@ -1482,7 +1482,7 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu) struct inet_sock *inet = inet_sk(sk); if (!dst) { - dst = inet_csk_rebuild_route(sk, &inet->cork.fl); + dst = inet_csk_rebuild_route(sk, &inet->cork->fl); if (!dst) goto out; } @@ -1490,7 +1490,7 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu) dst = __sk_dst_check(sk, 0); if (!dst) - dst = inet_csk_rebuild_route(sk, &inet->cork.fl); + dst = inet_csk_rebuild_route(sk, &inet->cork->fl); out: return dst; } -- 2.42.0