moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcp: expose the tcp_mark_push() and tcp_skb_entail() helpers

Browse Source 
[ Upstream commit 04d8825c30b718781197c8f07b1915a11bfb8685 ]

the tcp_skb_entail() helper is actually skb_entail(), renamed
to provide proper scope.

    The two helper will be used by the next patch.

RFC -> v1:
 - rename skb_entail to tcp_skb_entail (Eric)

Acked-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Paolo Abeni
2021-09-22 19:26:40 +02:00
committed by Greg Kroah-Hartman
parent 2baeaef4dd
commit a07f3af639
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/tcp.h
View File

@@ -571,6 +571,8 @@ __u32 cookie_v6_init_sequence(const struct sk_buff *skb, __u16 *mss);
#endif #endif
/* tcp_output.c */ /* tcp_output.c */
void tcp_skb_entail(struct sock *sk, struct sk_buff *skb);
void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb);
void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss, void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,
int nonagle); int nonagle);
int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs); int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs);

8
net/ipv4/tcp.c
View File

@@ -644,7 +644,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
} }
EXPORT_SYMBOL(tcp_ioctl); EXPORT_SYMBOL(tcp_ioctl);
static inline void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb) void tcp_mark_push(struct tcp_sock *tp, struct sk_buff *skb)
{ {
TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_PSH; TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_PSH;
tp->pushed_seq = tp->write_seq; tp->pushed_seq = tp->write_seq;
@@ -655,7 +655,7 @@ static inline bool forced_push(const struct tcp_sock *tp)
return after(tp->write_seq, tp->pushed_seq + (tp->max_window >> 1)); return after(tp->write_seq, tp->pushed_seq + (tp->max_window >> 1));
} }
static void skb_entail(struct sock *sk, struct sk_buff *skb) void tcp_skb_entail(struct sock *sk, struct sk_buff *skb)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
@@ -982,7 +982,7 @@ new_segment:
#ifdef CONFIG_TLS_DEVICE #ifdef CONFIG_TLS_DEVICE
skb->decrypted = !!(flags & MSG_SENDPAGE_DECRYPTED); skb->decrypted = !!(flags & MSG_SENDPAGE_DECRYPTED);
#endif #endif
skb_entail(sk, skb); tcp_skb_entail(sk, skb);
copy = size_goal; copy = size_goal;
} }
@@ -1312,7 +1312,7 @@ new_segment:
process_backlog++; process_backlog++;
skb->ip_summed = CHECKSUM_PARTIAL; skb->ip_summed = CHECKSUM_PARTIAL;
skb_entail(sk, skb); tcp_skb_entail(sk, skb);
copy = size_goal; copy = size_goal;
/* All packets are restored as if they have /* All packets are restored as if they have