diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-08 10:48:25 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-08 10:48:25 -0500 |
| commit | 62cd277039a3413604f486f0ca87faec810d7bb7 (patch) | |
| tree | 2bc63a72a3c46a91fc4dcf0ed2a7e60a69859c2a /include/net/tcp.h | |
| parent | 124da8f6118bce3d9aeb5c6f5395ed131141aad5 (diff) | |
| parent | 47adc5b07c6e0336896f84e404a6a7e1dce7878e (diff) | |
| download | linux-62cd277039a3413604f486f0ca87faec810d7bb7.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2017-12-07
The following pull-request contains BPF updates for your net-next tree.
The main changes are:
1) Detailed documentation of BPF development process from Daniel.
2) Addition of is_fullsock, snd_cwnd and srtt_us fields to bpf_sock_ops
from Lawrence.
3) Minor follow up for bpf_skb_set_tunnel_key() from William.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 6998707e81f3..6cc205ccccc1 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2011,10 +2011,12 @@ static inline int tcp_call_bpf(struct sock *sk, int op) struct bpf_sock_ops_kern sock_ops; int ret; - if (sk_fullsock(sk)) + memset(&sock_ops, 0, sizeof(sock_ops)); + if (sk_fullsock(sk)) { + sock_ops.is_fullsock = 1; sock_owned_by_me(sk); + } - memset(&sock_ops, 0, sizeof(sock_ops)); sock_ops.sk = sk; sock_ops.op = op; |