Message ID | f2ebee0285828524243efc13c157007327c2277a.1697989543.git.ozlinuxc@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp838501vqx; Sun, 22 Oct 2023 09:21:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEF9JXyV2b0E4RB/V8JTVLEO/zmo+kfAbykOs52BjLQ46xsSQNNRWT2I7VBPlksXryxpWnd X-Received: by 2002:a17:902:c942:b0:1c9:dcea:33e5 with SMTP id i2-20020a170902c94200b001c9dcea33e5mr7341901pla.67.1697991700363; Sun, 22 Oct 2023 09:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697991700; cv=none; d=google.com; s=arc-20160816; b=oJmpjyWIjLoVsv7LKFnAPT8THk2XOGLv1Wv57H+wzVu63gAUnUL+NIukoA0WJfaJDp uiHWP5yd9IXIL0VNgB2v3Zst1A0YjuSCyyj+mTe+6zJp0ct/aT+tXVz60IuJM0VdXn8/ WwZojCPP9D5/CERGcN/FSmwWDWb2+e+R8b0tpKTHfxQPzDZergvRg2KlT0dHYWFaIiPX BDPpbEmGSHuUMb2gIPPfpkrDsmONylvO3pGas9Q5Y65gujNOR2TT/4chCSYck6wgd9DF +ruB6XpIO13mI59dkA0lsPdcvhPDb5/3rDA9b/8TWZ+e74BNuP7HXAE5cKU+YxrcgY8a wQ8w== 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=3w20SDE19R7M/DBYsehJexNI3rG7cUtG/NhFavJbLJk=; fh=GKuCftXWVuD2V02qa8+3+sB56hLITty73r2bEYgwwVo=; b=BYImHNNj9WGJXlAd2ryp9uRI8Yo5lJEye56bNVn17+DVDOKUcHrQgmi97mwKGaB+Vm vFkZ1oGw/KRRum1ieeqhPEPnjUg61Zh8dlItGVkFpXzKKokNSYF9kuSDqaT/tQGh2d2R xteDkp4MAqp+zdn5yoeffp2rUSF5blps5hcRucjiMd/PZJ0a0LfBtQdZ3VLZ/mBFHHqD m1Opn0q9uyooGJsLdwfU4Cj4zNgFguGNymT3xPjK0eXuWcDglowHvFpOT+mEzR45H7BB +vP9fj0uJq3AwM9lHT9ZuDubIVQD+MnWBfWBmisPcloLv1MyRkIU5xuuLXh24M1AFhJ4 MNwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aPNL8Wmd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id y22-20020a1709027c9600b001ca85b797c9si4839508pll.624.2023.10.22.09.21.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:21:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aPNL8Wmd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 A5901807617D; Sun, 22 Oct 2023 09:21:09 -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 S232568AbjJVQU7 (ORCPT <rfc822;a1648639935@gmail.com> + 27 others); Sun, 22 Oct 2023 12:20:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232500AbjJVQUt (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 22 Oct 2023 12:20:49 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D62CD52; Sun, 22 Oct 2023 09:20:45 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-777719639adso153413685a.3; Sun, 22 Oct 2023 09:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697991643; x=1698596443; 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=3w20SDE19R7M/DBYsehJexNI3rG7cUtG/NhFavJbLJk=; b=aPNL8Wmdv02ptk8uFNKKJwbRENvPKZkD40/cnEH5tGvRyaiLqFEchMzU+96w5QrYSO GQHhly9jbhNw0+V0XAEp9EQVmZMR6xDwTmDmQNkwPMgpwtSoboJTh7HzqAM6muGBBMPo OA8FP7gIsb/0kTkAWPojR3Oi+n8ChV42Q8nLyR77s0/DUCbA0+9iM8M+vElasDn+J9hT IyJAT9ugS9vyv3qIoLjLpjnD+oeqhfWtztSeBcn+t9FSOG99jBrRhyPhVcL2mI0+k2he LJUyRIb+kUcJtivDpq9dP0zM9l5qSIdONc0dSwaVxmnRCz/lK3Rc10rpqDCEOJZlhBnK tsZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697991643; x=1698596443; 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=3w20SDE19R7M/DBYsehJexNI3rG7cUtG/NhFavJbLJk=; b=C/b1fD3mevJvgHfpm3KN9J2WabrbHOvuMEX7dfdSbvqDQ2c12ooGv5DoPeswBcrxYa /COx66KLoKjROKGue+GQ+IA5T9lrYzsyu0R1U1u+UhHRPRLfXe/J1xToiyzEwqzZ4ax+ YSQRMRs7BBGwnrk4sk6UXEyMK2zQeDR1WaIfnR2NcOlcsUevOS1pzLv/zR3FgEV6h0Or CR3nHGzkrK3GlwMNX0N0v59VJZefpTFodO1bB2GIS6HHNoX78cW218zdQSzdIG/dq/LC Cnp2hkI7XA0ooRhJcvG2i1LAyi+7RWVx4abQ2cUWa/qY0hn0TOrBQkQB+Yvna/ZGDIzF DxNQ== X-Gm-Message-State: AOJu0YyOFFozDDYW1rsYd/nuiujbKAR6qkzBpsFT8qbjdRiIVPHZFKD3 RsJ6TqTy19xyvsqGA4qUWZ2f4wSn4UyU+3Vv X-Received: by 2002:ae9:e912:0:b0:774:3235:4e6d with SMTP id x18-20020ae9e912000000b0077432354e6dmr6496497qkf.21.1697991643257; Sun, 22 Oct 2023 09:20:43 -0700 (PDT) Received: from localhost ([2601:8c:502:14f0:d6de:9959:3c29:509b]) by smtp.gmail.com with ESMTPSA id vq6-20020a05620a558600b0076e672f535asm2095914qkn.57.2023.10.22.09.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 09:20:43 -0700 (PDT) Date: Sun, 22 Oct 2023 12:20:42 -0400 From: Oliver Crumrine <ozlinuxc@gmail.com> To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: davem@davemloft.n Subject: [PATCH net-next 07/17] Change occurences of cork to pointer Message-ID: <f2ebee0285828524243efc13c157007327c2277a.1697989543.git.ozlinuxc@gmail.com> References: <cover.1697989543.git.ozlinuxc@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <cover.1697989543.git.ozlinuxc@gmail.com> 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: <linux-kernel.vger.kernel.org> 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:09 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780473345290130833 X-GMAIL-MSGID: 1780473345290130833 |
Series |
Change cork to a pointer in sockets
|
|
Commit Message
Oliver Crumrine
Oct. 22, 2023, 4:20 p.m. UTC
Change two occurences of cork to a pointer in both inet_sk_reselect_saddr,
and inet_sk_rebuild_header.
Signed-off-by: Oliver Crumrine <ozlinuxc@gmail.com>
---
net/ipv4/af_inet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 3edfd8737715..60f693040a2c 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1263,7 +1263,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) daddr = inet_opt->opt.faddr; /* Query new route. */ - fl4 = &inet->cork.fl.u.ip4; + fl4 = &inet->cork->fl.u.ip4; rt = ip_route_connect(fl4, daddr, 0, sk->sk_bound_dev_if, sk->sk_protocol, inet->inet_sport, inet->inet_dport, sk); @@ -1321,7 +1321,7 @@ int inet_sk_rebuild_header(struct sock *sk) if (inet_opt && inet_opt->opt.srr) daddr = inet_opt->opt.faddr; rcu_read_unlock(); - fl4 = &inet->cork.fl.u.ip4; + fl4 = &inet->cork->fl.u.ip4; rt = ip_route_output_ports(sock_net(sk), fl4, sk, daddr, inet->inet_saddr, inet->inet_dport, inet->inet_sport, sk->sk_protocol, RT_CONN_FLAGS(sk),