diff options
| author | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2025-03-26 13:50:46 +0100 |
| commit | 770493524e9f623826765eb97c64d699f4752e4f (patch) | |
| tree | 304c718009aa32834511d45497adb8acba496088 /net/core/skmsg.c | |
| parent | e4f7cc8c36e7cab391683db682402ab2f185bf92 (diff) | |
| parent | fe0fb58325e519008e2606a5aa2cff7ad23e212d (diff) | |
Merge branch 'for-6.15/intel-ish' into for-linus
- intel-ish Kbuild cleanup (Jiri Kosina)
Diffstat (limited to 'net/core/skmsg.c')
| -rw-r--r-- | net/core/skmsg.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 61f3f3d4e528..0ddc4c718833 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -549,6 +549,9 @@ static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb, return num_sge; } +#if IS_ENABLED(CONFIG_BPF_STREAM_PARSER) + psock->ingress_bytes += len; +#endif copied = len; msg->sg.start = 0; msg->sg.size = copied; @@ -1144,6 +1147,10 @@ int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock) if (!ret) sk_psock_set_state(psock, SK_PSOCK_RX_STRP_ENABLED); + if (sk_is_tcp(sk)) { + psock->strp.cb.read_sock = tcp_bpf_strp_read_sock; + psock->copied_seq = tcp_sk(sk)->copied_seq; + } return ret; } |