Commit f3b46a3e authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jakub Kicinski

ipv6: pass full cork into __ip6_append_data()

Convert a struct inet_cork argument in __ip6_append_data() to struct
inet_cork_full. As one struct contains another inet_cork is still can
be accessed via ->base field. It's a preparation patch making further
changes a bit cleaner.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 940ea00b
...@@ -1424,7 +1424,7 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork, ...@@ -1424,7 +1424,7 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork,
static int __ip6_append_data(struct sock *sk, static int __ip6_append_data(struct sock *sk,
struct flowi6 *fl6, struct flowi6 *fl6,
struct sk_buff_head *queue, struct sk_buff_head *queue,
struct inet_cork *cork, struct inet_cork_full *cork_full,
struct inet6_cork *v6_cork, struct inet6_cork *v6_cork,
struct page_frag *pfrag, struct page_frag *pfrag,
int getfrag(void *from, char *to, int offset, int getfrag(void *from, char *to, int offset,
...@@ -1433,6 +1433,7 @@ static int __ip6_append_data(struct sock *sk, ...@@ -1433,6 +1433,7 @@ static int __ip6_append_data(struct sock *sk,
unsigned int flags, struct ipcm6_cookie *ipc6) unsigned int flags, struct ipcm6_cookie *ipc6)
{ {
struct sk_buff *skb, *skb_prev = NULL; struct sk_buff *skb, *skb_prev = NULL;
struct inet_cork *cork = &cork_full->base;
unsigned int maxfraglen, fragheaderlen, mtu, orig_mtu, pmtu; unsigned int maxfraglen, fragheaderlen, mtu, orig_mtu, pmtu;
struct ubuf_info *uarg = NULL; struct ubuf_info *uarg = NULL;
int exthdrlen = 0; int exthdrlen = 0;
...@@ -1797,7 +1798,7 @@ int ip6_append_data(struct sock *sk, ...@@ -1797,7 +1798,7 @@ int ip6_append_data(struct sock *sk,
transhdrlen = 0; transhdrlen = 0;
} }
return __ip6_append_data(sk, fl6, &sk->sk_write_queue, &inet->cork.base, return __ip6_append_data(sk, fl6, &sk->sk_write_queue, &inet->cork,
&np->cork, sk_page_frag(sk), getfrag, &np->cork, sk_page_frag(sk), getfrag,
from, length, transhdrlen, flags, ipc6); from, length, transhdrlen, flags, ipc6);
} }
...@@ -1993,7 +1994,7 @@ struct sk_buff *ip6_make_skb(struct sock *sk, ...@@ -1993,7 +1994,7 @@ struct sk_buff *ip6_make_skb(struct sock *sk,
if (ipc6->dontfrag < 0) if (ipc6->dontfrag < 0)
ipc6->dontfrag = inet6_sk(sk)->dontfrag; ipc6->dontfrag = inet6_sk(sk)->dontfrag;
err = __ip6_append_data(sk, fl6, &queue, &cork->base, &v6_cork, err = __ip6_append_data(sk, fl6, &queue, cork, &v6_cork,
&current->task_frag, getfrag, from, &current->task_frag, getfrag, from,
length + exthdrlen, transhdrlen + exthdrlen, length + exthdrlen, transhdrlen + exthdrlen,
flags, ipc6); flags, ipc6);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment