diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2022-03-21 10:57:51 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-03-22 21:12:14 +0100 |
| commit | b9067cd80fbc5b3ae061e5bde6efd19bbf02f9e2 (patch) | |
| tree | fdaaed7ef09b95c42def87363f084a4f46b7369f /include/net | |
| parent | x86/Kconfig: Only allow CONFIG_X86_KERNEL_IBT with ld.lld >= 14.0.0 (diff) | |
| parent | kvm/emulate: Fix SETcc emulation function offsets with SLS (diff) | |
Merge branch 'kvm/kvm-sls-fix'
Sync with the last minute SLS fix to extend it for IBT.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/af_vsock.h | 3 | ||||
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h index ab207677e0a8..f742e50207fb 100644 --- a/include/net/af_vsock.h +++ b/include/net/af_vsock.h @@ -205,7 +205,8 @@ struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr); struct sock *vsock_find_connected_socket(struct sockaddr_vm *src, struct sockaddr_vm *dst); void vsock_remove_sock(struct vsock_sock *vsk); -void vsock_for_each_connected_socket(void (*fn)(struct sock *sk)); +void vsock_for_each_connected_socket(struct vsock_transport *transport, + void (*fn)(struct sock *sk)); int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk); bool vsock_find_cid(unsigned int cid); diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 8731d5bcb47d..b08b70989d2c 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -97,7 +97,6 @@ struct nf_conn { unsigned long status; u16 cpu; - u16 local_origin:1; possible_net_t ct_net; #if IS_ENABLED(CONFIG_NF_NAT) |