netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Oliver Crumrine <ozlinuxc@gmail.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: davem@davemloft.n
Subject: [PATCH net-next 13/17] Change some instances of cork to a pointer
Date: Sun, 22 Oct 2023 12:21:14 -0400	[thread overview]
Message-ID: <94dac142f2e312e2f3bc7926d5752a1059075d89.1697989543.git.ozlinuxc@gmail.com> (raw)
In-Reply-To: <cover.1697989543.git.ozlinuxc@gmail.com>

Changes a few instances of cork to a pointer in accordance with the
previous patches

Signed-off-by: Oliver Crumrine <ozlinuxc@gmail.com>
---
 net/ipv4/udp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index f39b9c844580..51b64024124b 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -981,7 +981,7 @@ int udp_push_pending_frames(struct sock *sk)
 {
 	struct udp_sock  *up = udp_sk(sk);
 	struct inet_sock *inet = inet_sk(sk);
-	struct flowi4 *fl4 = &inet->cork.fl.u.ip4;
+	struct flowi4 *fl4 = &inet->cork->fl.u.ip4;
 	struct sk_buff *skb;
 	int err = 0;
 
@@ -989,7 +989,7 @@ int udp_push_pending_frames(struct sock *sk)
 	if (!skb)
 		goto out;
 
-	err = udp_send_skb(skb, fl4, &inet->cork.base);
+	err = udp_send_skb(skb, fl4, &inet->cork->base);
 
 out:
 	up->len = 0;
@@ -1068,7 +1068,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 
 	getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag;
 
-	fl4 = &inet->cork.fl.u.ip4;
+	fl4 = &inet->cork->fl.u.ip4;
 	if (up->pending) {
 		/*
 		 * There are pending frames.
@@ -1260,7 +1260,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 	/*
 	 *	Now cork the socket to pend data.
 	 */
-	fl4 = &inet->cork.fl.u.ip4;
+	fl4 = &inet->cork->fl.u.ip4;
 	fl4->daddr = daddr;
 	fl4->saddr = saddr;
 	fl4->fl4_dport = dport;
-- 
2.42.0


  parent reply	other threads:[~2023-10-22 16:21 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-22 16:19 [PATCH net-next 00/17] Change cork to a pointer in sockets Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 01/17] Make cork in inet_sock a pointer Oliver Crumrine
2023-10-23  7:05   ` Ravi Gunasekaran
2023-10-22 16:20 ` [PATCH net-next 02/17] Allocate and free cork for ipv4 and ipv6 Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 03/17] Change cork in ipv6_pinfo to a pointer Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 04/17] Allocate and free cork in inet6_sk Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 05/17] Change occurence of cork to pointer Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 06/17] Update code for cork as a pointer Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 07/17] Change occurences of cork to pointer Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 08/17] Update " Oliver Crumrine
2023-10-22 16:20 ` [PATCH net-next 09/17] Change instances of cork to a pointer Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 11/17] Update occurences of cork to pointer Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 12/17] Change an occurence " Oliver Crumrine
2023-10-22 16:21 ` Oliver Crumrine [this message]
2023-10-22 16:21 ` [PATCH net-next 14/17] Update usages of cork to a pointer Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 15/17] Modify occurences of cork to make it " Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 16/17] Change a usage of cork to pointer Oliver Crumrine
2023-10-22 16:21 ` [PATCH net-next 17/17] Change the last instance " Oliver Crumrine
2023-10-23  8:24 ` [PATCH net-next 00/17] Change cork to a pointer in sockets Paolo Abeni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=94dac142f2e312e2f3bc7926d5752a1059075d89.1697989543.git.ozlinuxc@gmail.com \
    --to=ozlinuxc@gmail.com \
    --cc=davem@davemloft.n \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).