diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-18 15:02:27 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-18 15:02:27 -0700 |
| commit | 038c4bf85ba2bca715db3ca4d190de3e5299c6c3 (patch) | |
| tree | 087d4159caceecb334a322f5f1a3908d57159468 /include | |
| parent | c853246539f37936f20a38c12e55d54fe72f1c2a (diff) | |
| parent | d95bca4fbde0a29a3d987c39fd17e414f1ed5ec6 (diff) | |
| download | linux-stable-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.tar.gz linux-stable-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.tar.bz2 linux-stable-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.zip | |
Merge branch 'ib/5.17-cros-ec-keyb' into next
Merge changes to ChromeOS EC Keyboard driver.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_arp.h | 1 | ||||
| -rw-r--r-- | include/net/af_vsock.h | 3 | ||||
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index b712217f7030..1ed52441972f 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -52,6 +52,7 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev) case ARPHRD_VOID: case ARPHRD_NONE: case ARPHRD_RAWIP: + case ARPHRD_PIMREG: return false; default: return true; 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) |