From: Oliver Crumrine <ozlinuxc@gmail.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: davem@davemloft.n
Subject: [PATCH net-next 14/17] Update usages of cork to a pointer
Date: Sun, 22 Oct 2023 12:21:23 -0400 [thread overview]
Message-ID: <6b6cc028300b69b1f201b02e67e4fcf68aa7fff1.1697989543.git.ozlinuxc@gmail.com> (raw)
In-Reply-To: <cover.1697989543.git.ozlinuxc@gmail.com>
Modify a few instances of cork to be a pointer
Signed-off-by: Oliver Crumrine <ozlinuxc@gmail.com>
---
net/ipv6/ip6_output.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 54fc4c711f2c..5f24087bc9e2 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1878,12 +1878,12 @@ int ip6_append_data(struct sock *sk,
* setup for corking
*/
dst_hold(&rt->dst);
- err = ip6_setup_cork(sk, &inet->cork, &np->cork,
+ err = ip6_setup_cork(sk, inet->cork, np->cork,
ipc6, rt);
if (err)
return err;
- inet->cork.fl.u.ip6 = *fl6;
+ inet->cork->fl.u.ip6 = *fl6;
exthdrlen = (ipc6->opt ? ipc6->opt->opt_flen : 0);
length += exthdrlen;
transhdrlen += exthdrlen;
@@ -1891,8 +1891,8 @@ int ip6_append_data(struct sock *sk,
transhdrlen = 0;
}
- return __ip6_append_data(sk, &sk->sk_write_queue, &inet->cork,
- &np->cork, sk_page_frag(sk), getfrag,
+ return __ip6_append_data(sk, &sk->sk_write_queue, inet->cork,
+ np->cork, sk_page_frag(sk), getfrag,
from, length, transhdrlen, flags, ipc6);
}
EXPORT_SYMBOL_GPL(ip6_append_data);
@@ -2058,7 +2058,7 @@ static void __ip6_flush_pending_frames(struct sock *sk,
void ip6_flush_pending_frames(struct sock *sk)
{
__ip6_flush_pending_frames(sk, &sk->sk_write_queue,
- &inet_sk(sk)->cork, &inet6_sk(sk)->cork);
+ inet_sk(sk)->cork, inet6_sk(sk)->cork);
}
EXPORT_SYMBOL_GPL(ip6_flush_pending_frames);
--
2.42.0
next prev 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 ` [PATCH net-next 13/17] Change some instances of cork to a pointer Oliver Crumrine
2023-10-22 16:21 ` Oliver Crumrine [this message]
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=6b6cc028300b69b1f201b02e67e4fcf68aa7fff1.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).