Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Pull networking updates from David Miller: 1) Support 6Ghz band in ath11k driver, from Rajkumar Manoharan. 2) Support UDP segmentation in code TSO code, from Eric Dumazet. 3) Allow flashing different flash images in cxgb4 driver, from Vishal Kulkarni. 4) Add drop frames counter and flow status to tc flower offloading, from Po Liu. 5) Support n-tuple filters in cxgb4, from Vishal Kulkarni. 6) Various new indirect call avoidance, from Eric Dumazet and Brian Vazquez. 7) Fix BPF verifier failures on 32-bit pointer arithmetic, from Yonghong Song. 8) Support querying and setting hardware address of a port function via devlink, use this in mlx5, from Parav Pandit. 9) Support hw ipsec offload on bonding slaves, from Jarod Wilson. 10) Switch qca8k driver over to phylink, from Jonathan McDowell. 11) In bpftool, show list of processes holding BPF FD references to maps, programs, links, and btf objects. From Andrii Nakryiko. 12) Several conversions over to generic power management, from Vaibhav Gupta. 13) Add support for SO_KEEPALIVE et al. to bpf_setsockopt(), from Dmitry Yakunin. 14) Various https url conversions, from Alexander A. Klimov. 15) Timestamping and PHC support for mscc PHY driver, from Antoine Tenart. 16) Support bpf iterating over tcp and udp sockets, from Yonghong Song. 17) Support 5GBASE-T i40e NICs, from Aleksandr Loktionov. 18) Add kTLS RX HW offload support to mlx5e, from Tariq Toukan. 19) Fix the ->ndo_start_xmit() return type to be netdev_tx_t in several drivers. From Luc Van Oostenryck. 20) XDP support for xen-netfront, from Denis Kirjanov. 21) Support receive buffer autotuning in MPTCP, from Florian Westphal. 22) Support EF100 chip in sfc driver, from Edward Cree. 23) Add XDP support to mvpp2 driver, from Matteo Croce. 24) Support MPTCP in sock_diag, from Paolo Abeni. 25) Commonize UDP tunnel offloading code by creating udp_tunnel_nic infrastructure, from Jakub Kicinski. 26) Several pci_ --> dma_ API conversions, from Christophe JAILLET. 27) Add FLOW_ACTION_POLICE support to mlxsw, from Ido Schimmel. 28) Add SK_LOOKUP bpf program type, from Jakub Sitnicki. 29) Refactor a lot of networking socket option handling code in order to avoid set_fs() calls, from Christoph Hellwig. 30) Add rfc4884 support to icmp code, from Willem de Bruijn. 31) Support TBF offload in dpaa2-eth driver, from Ioana Ciornei. 32) Support XDP_REDIRECT in qede driver, from Alexander Lobakin. 33) Support PCI relaxed ordering in mlx5 driver, from Aya Levin. 34) Support TCP syncookies in MPTCP, from Flowian Westphal. 35) Fix several tricky cases of PMTU handling wrt. briding, from Stefano Brivio. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (2056 commits) net: thunderx: initialize VF's mailbox mutex before first usage usb: hso: remove bogus check for EINPROGRESS usb: hso: no complaint about kmalloc failure hso: fix bailout in error case of probe ip_tunnel_core: Fix build for archs without _HAVE_ARCH_IPV6_CSUM selftests/net: relax cpu affinity requirement in msg_zerocopy test mptcp: be careful on subflow creation selftests: rtnetlink: make kci_test_encap() return sub-test result selftests: rtnetlink: correct the final return value for the test net: dsa: sja1105: use detected device id instead of DT one on mismatch tipc: set ub->ifindex for local ipv6 address ipv6: add ipv6_dev_find() net: openvswitch: silence suspicious RCU usage warning Revert "vxlan: fix tos value before xmit" ptp: only allow phase values lower than 1 period farsync: switch from 'pci_' to 'dma_' API wan: wanxl: switch from 'pci_' to 'dma_' API hv_netvsc: do not use VF device if link is down dpaa2-eth: Fix passing zero to 'PTR_ERR' warning net: macb: Properly handle phylink on at91sam9x ...

Linus Torvalds committed 6 years ago

Commit 47ec5302 parents 8186749 c1055b72088 files · +117531 −41040Browse files

Showing the changes to include/uapi/linux (36 of 2088 files). Show all

Unified · Split

36 files

include/uapi/linux/atmioc.h +1 −1
include/uapi/linux/batadv_packet.h +25 −25
include/uapi/linux/batman_adv.h +4 −3
include/uapi/linux/bpf.h +289 −104
include/uapi/linux/caif/caif_socket.h +1 −1
include/uapi/linux/devlink.h +15 −0
include/uapi/linux/errqueue.h +13 −1
include/uapi/linux/ethtool.h +87 −0
include/uapi/linux/ethtool_netlink.h +57 −0
include/uapi/linux/hsr_netlink.h +1 −1
include/uapi/linux/icmp.h +22 −0
include/uapi/linux/icmpv6.h +1 −0
include/uapi/linux/if_bridge.h +75 −0
include/uapi/linux/if_link.h +22 −1
include/uapi/linux/if_xdp.h +4 −1
include/uapi/linux/in.h +1 −0
include/uapi/linux/in6.h +1 −0
include/uapi/linux/inet_diag.h +1 −0
include/uapi/linux/mdio.h +26 −0
include/uapi/linux/mptcp.h +17 −0
include/uapi/linux/mrp_bridge.h +38 −0
include/uapi/linux/neighbour.h +24 −0
include/uapi/linux/netfilter/nf_tables.h +14 −0
include/uapi/linux/netfilter/xt_connmark.h +1 −1
include/uapi/linux/nl80211.h +72 −22
include/uapi/linux/openvswitch.h +2 −1
include/uapi/linux/pkt_cls.h +3 −0
include/uapi/linux/pkt_sched.h +2 −0
include/uapi/linux/ptp_clock.h +30 −4
include/uapi/linux/rtnetlink.h +24 −22
include/uapi/linux/seg6_iptunnel.h +0 −21
include/uapi/linux/snmp.h +1 −0
include/uapi/linux/tcp.h +1 −0
include/uapi/linux/wireless.h +1 −1
include/uapi/linux/xdp_diag.h +11 −0
include/uapi/linux/xfrm.h +1 −0

include/uapi/linux/atmioc.h+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5		5
6		6
7	/*	7	/*
8	* See http://icawww1.epfl.ch/linux-atm/magic.html for the complete list of	8	* See https://icawww1.epfl.ch/linux-atm/magic.html for the complete list of
9	* "magic" ioctl numbers.	9	* "magic" ioctl numbers.
10	*/	10	*/
11		11

include/uapi/linux/batadv_packet.h+25−25

include/uapi/linux/batman_adv.h+4−3

 	/**
 	 * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be
-	 * part of the network but no nnode has already announced it
+	 * part of the network but no node has already announced it
 	 */
 	BATADV_TT_CLIENT_TEMP	 = (1 << 11),
 };
 	/** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */
 	BATADV_GW_MODE_CLIENT,
-	/** @BATADV_GW_MODE_SERVER: announce itself as gatway server */
+	/** @BATADV_GW_MODE_SERVER: announce itself as gateway server */
 	BATADV_GW_MODE_SERVER,
 };
 	/**
 	 * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied
-	 *  to an originator message's tq-field on every hop.
+	 *  to an originator message's tq-field on every hop and/or per
+	 *  hard interface
 	 */
 	BATADV_ATTR_HOP_PENALTY,

include/uapi/linux/bpf.h+289−104

 	BPF_LINK_GET_NEXT_ID,
 	BPF_ENABLE_STATS,
 	BPF_ITER_CREATE,
+	BPF_LINK_DETACH,
 };
 enum bpf_map_type {
 	BPF_PROG_TYPE_STRUCT_OPS,
 	BPF_PROG_TYPE_EXT,
 	BPF_PROG_TYPE_LSM,
+	BPF_PROG_TYPE_SK_LOOKUP,
 };
 enum bpf_attach_type {
 	BPF_CGROUP_INET4_GETSOCKNAME,
 	BPF_CGROUP_INET6_GETSOCKNAME,
 	BPF_XDP_DEVMAP,
+	BPF_CGROUP_INET_SOCK_RELEASE,
+	BPF_XDP_CPUMAP,
+	BPF_SK_LOOKUP,
+	BPF_XDP,
 	__MAX_BPF_ATTACH_TYPE
 };
 	BPF_LINK_TYPE_CGROUP = 3,
 	BPF_LINK_TYPE_ITER = 4,
 	BPF_LINK_TYPE_NETNS = 5,
+	BPF_LINK_TYPE_XDP = 6,
 	MAX_BPF_LINK_TYPE,
 };
+enum bpf_iter_link_info {
+	BPF_ITER_LINK_UNSPEC = 0,
+	BPF_ITER_LINK_MAP_FD = 1,
+	MAX_BPF_ITER_LINK_INFO,
+};
 /* cgroup-bpf attach flags used in BPF_PROG_ATTACH command
  *
  * NONE(default): No further bpf programs allowed in the subtree.
 	struct { /* struct used by BPF_LINK_CREATE command */
 		__u32		prog_fd;	/* eBPF program to attach */
-		__u32		target_fd;	/* object to attach to */
+		union {
+			__u32		target_fd;	/* object to attach to */
+			__u32		target_ifindex; /* target ifindex */
+		};
 		__u32		attach_type;	/* attach type */
 		__u32		flags;		/* extra flags */
 	} link_create;
 		__u32		old_prog_fd;
 	} link_update;
+	struct {
+		__u32		link_fd;
+	} link_detach;
 	struct { /* struct used by BPF_ENABLE_STATS command */
 		__u32		type;
 	} enable_stats;
  * 		Map value associated to *key*, or **NULL** if no entry was
  * 		found.
  *
- * int bpf_map_update_elem(struct bpf_map *map, const void *key, const void *value, u64 flags)
+ * long bpf_map_update_elem(struct bpf_map *map, const void *key, const void *value, u64 flags)
  * 	Description
  * 		Add or update the value of the entry associated to *key* in
  * 		*map* with *value*. *flags* is one of:
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_map_delete_elem(struct bpf_map *map, const void *key)
+ * long bpf_map_delete_elem(struct bpf_map *map, const void *key)
  * 	Description
  * 		Delete entry with *key* from *map*.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_probe_read(void *dst, u32 size, const void *unsafe_ptr)
+ * long bpf_probe_read(void *dst, u32 size, const void *unsafe_ptr)
  * 	Description
  * 		For tracing programs, safely attempt to read *size* bytes from
  * 		kernel space address *unsafe_ptr* and store the data in *dst*.
  * 	Return
  * 		Current *ktime*.
  *
- * int bpf_trace_printk(const char *fmt, u32 fmt_size, ...)
+ * long bpf_trace_printk(const char *fmt, u32 fmt_size, ...)
  * 	Description
  * 		This helper is a "printk()-like" facility for debugging. It
  * 		prints a message defined by format *fmt* (of size *fmt_size*)
  * 	Return
  * 		The SMP id of the processor running the program.
  *
- * int bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len, u64 flags)
+ * long bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len, u64 flags)
  * 	Description
  * 		Store *len* bytes from address *from* into the packet
  * 		associated to *skb*, at *offset*. *flags* are a combination of
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_l3_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to, u64 size)
+ * long bpf_l3_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to, u64 size)
  * 	Description
  * 		Recompute the layer 3 (e.g. IP) checksum for the packet
  * 		associated to *skb*. Computation is incremental, so the helper
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_l4_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to, u64 flags)
+ * long bpf_l4_csum_replace(struct sk_buff *skb, u32 offset, u64 from, u64 to, u64 flags)
  * 	Description
  * 		Recompute the layer 4 (e.g. TCP, UDP or ICMP) checksum for the
  * 		packet associated to *skb*. Computation is incremental, so the
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_tail_call(void *ctx, struct bpf_map *prog_array_map, u32 index)
+ * long bpf_tail_call(void *ctx, struct bpf_map *prog_array_map, u32 index)
  * 	Description
  * 		This special helper is used to trigger a "tail call", or in
  * 		other words, to jump into another eBPF program. The same stack
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_clone_redirect(struct sk_buff *skb, u32 ifindex, u64 flags)
+ * long bpf_clone_redirect(struct sk_buff *skb, u32 ifindex, u64 flags)
  * 	Description
  * 		Clone and redirect the packet associated to *skb* to another
  * 		net device of index *ifindex*. Both ingress and egress
  * 		A 64-bit integer containing the current GID and UID, and
  * 		created as such: *current_gid* **<< 32 \|** *current_uid*.
  *
- * int bpf_get_current_comm(void *buf, u32 size_of_buf)
+ * long bpf_get_current_comm(void *buf, u32 size_of_buf)
  * 	Description
  * 		Copy the **comm** attribute of the current task into *buf* of
  * 		*size_of_buf*. The **comm** attribute contains the name of
  * 	Return
  * 		The classid, or 0 for the default unconfigured classid.
  *
- * int bpf_skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)
+ * long bpf_skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci)
  * 	Description
  * 		Push a *vlan_tci* (VLAN tag control information) of protocol
  * 		*vlan_proto* to the packet associated to *skb*, then update
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_vlan_pop(struct sk_buff *skb)
+ * long bpf_skb_vlan_pop(struct sk_buff *skb)
  * 	Description
  * 		Pop a VLAN header from the packet associated to *skb*.
  *
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_get_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key, u32 size, u64 flags)
+ * long bpf_skb_get_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key, u32 size, u64 flags)
  * 	Description
  * 		Get tunnel metadata. This helper takes a pointer *key* to an
  * 		empty **struct bpf_tunnel_key** of **size**, that will be
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_set_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key, u32 size, u64 flags)
+ * long bpf_skb_set_tunnel_key(struct sk_buff *skb, struct bpf_tunnel_key *key, u32 size, u64 flags)
  * 	Description
  * 		Populate tunnel metadata for packet associated to *skb.* The
  * 		tunnel metadata is set to the contents of *key*, of *size*. The
  * 		The value of the perf event counter read from the map, or a
  * 		negative error code in case of failure.
  *
- * int bpf_redirect(u32 ifindex, u64 flags)
+ * long bpf_redirect(u32 ifindex, u64 flags)
  * 	Description
  * 		Redirect the packet to another net device of index *ifindex*.
  * 		This helper is somewhat similar to **bpf_clone_redirect**\
  * 		The realm of the route for the packet associated to *skb*, or 0
  * 		if none was found.
  *
- * int bpf_perf_event_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
+ * long bpf_perf_event_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
  * 	Description
  * 		Write raw *data* blob into a special BPF perf event held by
  * 		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_load_bytes(const void *skb, u32 offset, void *to, u32 len)
+ * long bpf_skb_load_bytes(const void *skb, u32 offset, void *to, u32 len)
  * 	Description
  * 		This helper was provided as an easy way to load data from a
  * 		packet. It can be used to load *len* bytes from *offset* from
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_get_stackid(void *ctx, struct bpf_map *map, u64 flags)
+ * long bpf_get_stackid(void *ctx, struct bpf_map *map, u64 flags)
  * 	Description
  * 		Walk a user or a kernel stack and return its id. To achieve
  * 		this, the helper needs *ctx*, which is a pointer to the context
  * 		The checksum result, or a negative error code in case of
  * 		failure.
  *
- * int bpf_skb_get_tunnel_opt(struct sk_buff *skb, void *opt, u32 size)
+ * long bpf_skb_get_tunnel_opt(struct sk_buff *skb, void *opt, u32 size)
  * 	Description
  * 		Retrieve tunnel options metadata for the packet associated to
  * 		*skb*, and store the raw tunnel option data to the buffer *opt*
  * 	Return
  * 		The size of the option data retrieved.
  *
- * int bpf_skb_set_tunnel_opt(struct sk_buff *skb, void *opt, u32 size)
+ * long bpf_skb_set_tunnel_opt(struct sk_buff *skb, void *opt, u32 size)
  * 	Description
  * 		Set tunnel options metadata for the packet associated to *skb*
  * 		to the option data contained in the raw buffer *opt* of *size*.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_change_proto(struct sk_buff *skb, __be16 proto, u64 flags)
+ * long bpf_skb_change_proto(struct sk_buff *skb, __be16 proto, u64 flags)
  * 	Description
  * 		Change the protocol of the *skb* to *proto*. Currently
  * 		supported are transition from IPv4 to IPv6, and from IPv6 to
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_change_type(struct sk_buff *skb, u32 type)
+ * long bpf_skb_change_type(struct sk_buff *skb, u32 type)
  * 	Description
  * 		Change the packet type for the packet associated to *skb*. This
  * 		comes down to setting *skb*\ **->pkt_type** to *type*, except
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_under_cgroup(struct sk_buff *skb, struct bpf_map *map, u32 index)
+ * long bpf_skb_under_cgroup(struct sk_buff *skb, struct bpf_map *map, u32 index)
  * 	Description
  * 		Check whether *skb* is a descendant of the cgroup2 held by
  * 		*map* of type **BPF_MAP_TYPE_CGROUP_ARRAY**, at *index*.
  * 	Return
  * 		A pointer to the current task struct.
  *
- * int bpf_probe_write_user(void *dst, const void *src, u32 len)
+ * long bpf_probe_write_user(void *dst, const void *src, u32 len)
  * 	Description
  * 		Attempt in a safe way to write *len* bytes from the buffer
  * 		*src* to *dst* in memory. It only works for threads that are in
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_current_task_under_cgroup(struct bpf_map *map, u32 index)
+ * long bpf_current_task_under_cgroup(struct bpf_map *map, u32 index)
  * 	Description
  * 		Check whether the probe is being run is the context of a given
  * 		subset of the cgroup2 hierarchy. The cgroup2 to test is held by
  * 		* 1, if the *skb* task does not belong to the cgroup2.
  * 		* A negative error code, if an error occurred.
  *
- * int bpf_skb_change_tail(struct sk_buff *skb, u32 len, u64 flags)
+ * long bpf_skb_change_tail(struct sk_buff *skb, u32 len, u64 flags)
  * 	Description
  * 		Resize (trim or grow) the packet associated to *skb* to the
  * 		new *len*. The *flags* are reserved for future usage, and must
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_pull_data(struct sk_buff *skb, u32 len)
+ * long bpf_skb_pull_data(struct sk_buff *skb, u32 len)
  * 	Description
  * 		Pull in non-linear data in case the *skb* is non-linear and not
  * 		all of *len* are part of the linear section. Make *len* bytes
  * 		recalculation the next time the kernel tries to access this
  * 		hash or when the **bpf_get_hash_recalc**\ () helper is called.
  *
- * int bpf_get_numa_node_id(void)
+ * long bpf_get_numa_node_id(void)
  * 	Description
  * 		Return the id of the current NUMA node. The primary use case
  * 		for this helper is the selection of sockets for the local NUMA
  * 	Return
  * 		The id of current NUMA node.
  *
- * int bpf_skb_change_head(struct sk_buff *skb, u32 len, u64 flags)
+ * long bpf_skb_change_head(struct sk_buff *skb, u32 len, u64 flags)
  * 	Description
  * 		Grows headroom of packet associated to *skb* and adjusts the
  * 		offset of the MAC header accordingly, adding *len* bytes of
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_xdp_adjust_head(struct xdp_buff *xdp_md, int delta)
+ * long bpf_xdp_adjust_head(struct xdp_buff *xdp_md, int delta)
  * 	Description
  * 		Adjust (move) *xdp_md*\ **->data** by *delta* bytes. Note that
  * 		it is possible to use a negative value for *delta*. This helper
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_probe_read_str(void *dst, u32 size, const void *unsafe_ptr)
+ * long bpf_probe_read_str(void *dst, u32 size, const void *unsafe_ptr)
  * 	Description
  * 		Copy a NUL terminated string from an unsafe kernel address
  * 		*unsafe_ptr* to *dst*. See **bpf_probe_read_kernel_str**\ () for
  * 		is returned (note that **overflowuid** might also be the actual
  * 		UID value for the socket).
  *
- * u32 bpf_set_hash(struct sk_buff *skb, u32 hash)
+ * long bpf_set_hash(struct sk_buff *skb, u32 hash)
  * 	Description
  * 		Set the full hash for *skb* (set the field *skb*\ **->hash**)
  * 		to value *hash*.
  * 	Return
  * 		0
  *
- * int bpf_setsockopt(void *bpf_socket, int level, int optname, void *optval, int optlen)
+ * long bpf_setsockopt(void *bpf_socket, int level, int optname, void *optval, int optlen)
  * 	Description
  * 		Emulate a call to **setsockopt()** on the socket associated to
  * 		*bpf_socket*, which must be a full socket. The *level* at
  *
  * 		* **SOL_SOCKET**, which supports the following *optname*\ s:
  * 		  **SO_RCVBUF**, **SO_SNDBUF**, **SO_MAX_PACING_RATE**,
- * 		  **SO_PRIORITY**, **SO_RCVLOWAT**, **SO_MARK**.
+ * 		  **SO_PRIORITY**, **SO_RCVLOWAT**, **SO_MARK**,
+ * 		  **SO_BINDTODEVICE**, **SO_KEEPALIVE**.
  * 		* **IPPROTO_TCP**, which supports the following *optname*\ s:
  * 		  **TCP_CONGESTION**, **TCP_BPF_IW**,
- * 		  **TCP_BPF_SNDCWND_CLAMP**.
+ * 		  **TCP_BPF_SNDCWND_CLAMP**, **TCP_SAVE_SYN**,
+ * 		  **TCP_KEEPIDLE**, **TCP_KEEPINTVL**, **TCP_KEEPCNT**,
+ * 		  **TCP_SYNCNT**, **TCP_USER_TIMEOUT**.
  * 		* **IPPROTO_IP**, which supports *optname* **IP_TOS**.
  * 		* **IPPROTO_IPV6**, which supports *optname* **IPV6_TCLASS**.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags)
+ * long bpf_skb_adjust_room(struct sk_buff *skb, s32 len_diff, u32 mode, u64 flags)
  * 	Description
  * 		Grow or shrink the room for data in the packet associated to
  * 		*skb* by *len_diff*, and according to the selected *mode*.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags)
+ * long bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags)
  * 	Description
  * 		Redirect the packet to the endpoint referenced by *map* at
  * 		index *key*. Depending on its type, this *map* can contain
  * 		**XDP_REDIRECT** on success, or the value of the two lower bits
  * 		of the *flags* argument on error.
  *
- * int bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key, u64 flags)
+ * long bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key, u64 flags)
  * 	Description
  * 		Redirect the packet to the socket referenced by *map* (of type
  * 		**BPF_MAP_TYPE_SOCKMAP**) at index *key*. Both ingress and
  * 	Return
  * 		**SK_PASS** on success, or **SK_DROP** on error.
  *
- * int bpf_sock_map_update(struct bpf_sock_ops *skops, struct bpf_map *map, void *key, u64 flags)
+ * long bpf_sock_map_update(struct bpf_sock_ops *skops, struct bpf_map *map, void *key, u64 flags)
  * 	Description
  * 		Add an entry to, or update a *map* referencing sockets. The
  * 		*skops* is used as a new value for the entry associated to
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_xdp_adjust_meta(struct xdp_buff *xdp_md, int delta)
+ * long bpf_xdp_adjust_meta(struct xdp_buff *xdp_md, int delta)
  * 	Description
  * 		Adjust the address pointed by *xdp_md*\ **->data_meta** by
  * 		*delta* (which can be positive or negative). Note that this
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_perf_event_read_value(struct bpf_map *map, u64 flags, struct bpf_perf_event_value *buf, u32 buf_size)
+ * long bpf_perf_event_read_value(struct bpf_map *map, u64 flags, struct bpf_perf_event_value *buf, u32 buf_size)
  * 	Description
  * 		Read the value of a perf event counter, and store it into *buf*
  * 		of size *buf_size*. This helper relies on a *map* of type
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_perf_prog_read_value(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, u32 buf_size)
+ * long bpf_perf_prog_read_value(struct bpf_perf_event_data *ctx, struct bpf_perf_event_value *buf, u32 buf_size)
  * 	Description
  * 		For en eBPF program attached to a perf event, retrieve the
  * 		value of the event counter associated to *ctx* and store it in
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_getsockopt(void *bpf_socket, int level, int optname, void *optval, int optlen)
+ * long bpf_getsockopt(void *bpf_socket, int level, int optname, void *optval, int optlen)
  * 	Description
  * 		Emulate a call to **getsockopt()** on the socket associated to
  * 		*bpf_socket*, which must be a full socket. The *level* at
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_override_return(struct pt_regs *regs, u64 rc)
+ * long bpf_override_return(struct pt_regs *regs, u64 rc)
  * 	Description
  * 		Used for error injection, this helper uses kprobes to override
  * 		the return value of the probed function, and to set it to *rc*.
  * 	Return
  * 		0
  *
- * int bpf_sock_ops_cb_flags_set(struct bpf_sock_ops *bpf_sock, int argval)
+ * long bpf_sock_ops_cb_flags_set(struct bpf_sock_ops *bpf_sock, int argval)
  * 	Description
  * 		Attempt to set the value of the **bpf_sock_ops_cb_flags** field
  * 		for the full TCP socket associated to *bpf_sock_ops* to
  * 		be set is returned (which comes down to 0 if all bits were set
  * 		as required).
  *
- * int bpf_msg_redirect_map(struct sk_msg_buff *msg, struct bpf_map *map, u32 key, u64 flags)
+ * long bpf_msg_redirect_map(struct sk_msg_buff *msg, struct bpf_map *map, u32 key, u64 flags)
  * 	Description
  * 		This helper is used in programs implementing policies at the
  * 		socket level. If the message *msg* is allowed to pass (i.e. if
  * 	Return
  * 		**SK_PASS** on success, or **SK_DROP** on error.
  *
- * int bpf_msg_apply_bytes(struct sk_msg_buff *msg, u32 bytes)
+ * long bpf_msg_apply_bytes(struct sk_msg_buff *msg, u32 bytes)
  * 	Description
  * 		For socket policies, apply the verdict of the eBPF program to
  * 		the next *bytes* (number of bytes) of message *msg*.
  * 	Return
  * 		0
  *
- * int bpf_msg_cork_bytes(struct sk_msg_buff *msg, u32 bytes)
+ * long bpf_msg_cork_bytes(struct sk_msg_buff *msg, u32 bytes)
  * 	Description
  * 		For socket policies, prevent the execution of the verdict eBPF
  * 		program for message *msg* until *bytes* (byte number) have been
  * 	Return
  * 		0
  *
- * int bpf_msg_pull_data(struct sk_msg_buff *msg, u32 start, u32 end, u64 flags)
+ * long bpf_msg_pull_data(struct sk_msg_buff *msg, u32 start, u32 end, u64 flags)
  * 	Description
  * 		For socket policies, pull in non-linear data from user space
  * 		for *msg* and set pointers *msg*\ **->data** and *msg*\
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_bind(struct bpf_sock_addr *ctx, struct sockaddr *addr, int addr_len)
+ * long bpf_bind(struct bpf_sock_addr *ctx, struct sockaddr *addr, int addr_len)
  * 	Description
  * 		Bind the socket associated to *ctx* to the address pointed by
  * 		*addr*, of length *addr_len*. This allows for making outgoing
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_xdp_adjust_tail(struct xdp_buff *xdp_md, int delta)
+ * long bpf_xdp_adjust_tail(struct xdp_buff *xdp_md, int delta)
  * 	Description
  * 		Adjust (move) *xdp_md*\ **->data_end** by *delta* bytes. It is
  * 		possible to both shrink and grow the packet tail.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_skb_get_xfrm_state(struct sk_buff *skb, u32 index, struct bpf_xfrm_state *xfrm_state, u32 size, u64 flags)
+ * long bpf_skb_get_xfrm_state(struct sk_buff *skb, u32 index, struct bpf_xfrm_state *xfrm_state, u32 size, u64 flags)
  * 	Description
  * 		Retrieve the XFRM state (IP transform framework, see also
  * 		**ip-xfrm(8)**) at *index* in XFRM "security path" for *skb*.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_get_stack(void *ctx, void *buf, u32 size, u64 flags)
+ * long bpf_get_stack(void *ctx, void *buf, u32 size, u64 flags)
  * 	Description
  * 		Return a user or a kernel stack in bpf program provided buffer.
  * 		To achieve this, the helper needs *ctx*, which is a pointer
  * 		A non-negative value equal to or less than *size* on success,
  * 		or a negative error in case of failure.
  *
- * int bpf_skb_load_bytes_relative(const void *skb, u32 offset, void *to, u32 len, u32 start_header)
+ * long bpf_skb_load_bytes_relative(const void *skb, u32 offset, void *to, u32 len, u32 start_header)
  * 	Description
  * 		This helper is similar to **bpf_skb_load_bytes**\ () in that
  * 		it provides an easy way to load *len* bytes from *offset*
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_fib_lookup(void *ctx, struct bpf_fib_lookup *params, int plen, u32 flags)
+ * long bpf_fib_lookup(void *ctx, struct bpf_fib_lookup *params, int plen, u32 flags)
  *	Description
  *		Do FIB lookup in kernel tables using parameters in *params*.
  *		If lookup is successful and result shows packet is to be
  *		* > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the
  *		  packet is not forwarded or needs assist from full stack
  *
- * int bpf_sock_hash_update(struct bpf_sock_ops *skops, struct bpf_map *map, void *key, u64 flags)
+ * long bpf_sock_hash_update(struct bpf_sock_ops *skops, struct bpf_map *map, void *key, u64 flags)
  *	Description
  *		Add an entry to, or update a sockhash *map* referencing sockets.
  *		The *skops* is used as a new value for the entry associated to
  *	Return
  *		0 on success, or a negative error in case of failure.
  *
- * int bpf_msg_redirect_hash(struct sk_msg_buff *msg, struct bpf_map *map, void *key, u64 flags)
+ * long bpf_msg_redirect_hash(struct sk_msg_buff *msg, struct bpf_map *map, void *key, u64 flags)
  *	Description
  *		This helper is used in programs implementing policies at the
  *		socket level. If the message *msg* is allowed to pass (i.e. if
  *	Return
  *		**SK_PASS** on success, or **SK_DROP** on error.
  *
- * int bpf_sk_redirect_hash(struct sk_buff *skb, struct bpf_map *map, void *key, u64 flags)
+ * long bpf_sk_redirect_hash(struct sk_buff *skb, struct bpf_map *map, void *key, u64 flags)
  *	Description
  *		This helper is used in programs implementing policies at the
  *		skb socket level. If the sk_buff *skb* is allowed to pass (i.e.
  *	Return
  *		**SK_PASS** on success, or **SK_DROP** on error.
  *
- * int bpf_lwt_push_encap(struct sk_buff *skb, u32 type, void *hdr, u32 len)
+ * long bpf_lwt_push_encap(struct sk_buff *skb, u32 type, void *hdr, u32 len)
  *	Description
  *		Encapsulate the packet associated to *skb* within a Layer 3
  *		protocol header. This header is provided in the buffer at
  *	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_lwt_seg6_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len)
+ * long bpf_lwt_seg6_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len)
  *	Description
  *		Store *len* bytes from address *from* into the packet
  *		associated to *skb*, at *offset*. Only the flags, tag and TLVs
  *	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_lwt_seg6_adjust_srh(struct sk_buff *skb, u32 offset, s32 delta)
+ * long bpf_lwt_seg6_adjust_srh(struct sk_buff *skb, u32 offset, s32 delta)
  *	Description
  *		Adjust the size allocated to TLVs in the outermost IPv6
  *		Segment Routing Header contained in the packet associated to
  *	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_lwt_seg6_action(struct sk_buff *skb, u32 action, void *param, u32 param_len)
+ * long bpf_lwt_seg6_action(struct sk_buff *skb, u32 action, void *param, u32 param_len)
  *	Description
  *		Apply an IPv6 Segment Routing action of type *action* to the
  *		packet associated to *skb*. Each action takes a parameter
  *	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_rc_repeat(void *ctx)
+ * long bpf_rc_repeat(void *ctx)
  *	Description
  *		This helper is used in programs implementing IR decoding, to
  *		report a successfully decoded repeat key message. This delays
  *	Return
  *		0
  *
- * int bpf_rc_keydown(void *ctx, u32 protocol, u64 scancode, u32 toggle)
+ * long bpf_rc_keydown(void *ctx, u32 protocol, u64 scancode, u32 toggle)
  *	Description
  *		This helper is used in programs implementing IR decoding, to
  *		report a successfully decoded key press with *scancode*,
  *	Return
  *		A pointer to the local storage area.
  *
- * int bpf_sk_select_reuseport(struct sk_reuseport_md *reuse, struct bpf_map *map, void *key, u64 flags)
+ * long bpf_sk_select_reuseport(struct sk_reuseport_md *reuse, struct bpf_map *map, void *key, u64 flags)
  *	Description
  *		Select a **SO_REUSEPORT** socket from a
  *		**BPF_MAP_TYPE_REUSEPORT_ARRAY** *map*.
  *			Look for an IPv6 socket.
  *
  *		If the *netns* is a negative signed 32-bit integer, then the
- *		socket lookup table in the netns associated with the *ctx* will
+ *		socket lookup table in the netns associated with the *ctx*
  *		will be used. For the TC hooks, this is the netns of the device
  *		in the skb. For socket hooks, this is the netns of the socket.
  *		If *netns* is any other signed 32-bit value greater than or
  *			Look for an IPv6 socket.
  *
  *		If the *netns* is a negative signed 32-bit integer, then the
- *		socket lookup table in the netns associated with the *ctx* will
+ *		socket lookup table in the netns associated with the *ctx*
  *		will be used. For the TC hooks, this is the netns of the device
  *		in the skb. For socket hooks, this is the netns of the socket.
  *		If *netns* is any other signed 32-bit value greater than or
  *		result is from *reuse*\ **->socks**\ [] using the hash of the
  *		tuple.
  *
- * int bpf_sk_release(struct bpf_sock *sock)
+ * long bpf_sk_release(struct bpf_sock *sock)
  *	Description
  *		Release the reference held by *sock*. *sock* must be a
  *		non-**NULL** pointer that was returned from
  *	Return
  *		0 on success, or a negative error in case of failure.
  *
- * int bpf_map_push_elem(struct bpf_map *map, const void *value, u64 flags)
+ * long bpf_map_push_elem(struct bpf_map *map, const void *value, u64 flags)
  * 	Description
  * 		Push an element *value* in *map*. *flags* is one of:
  *
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_map_pop_elem(struct bpf_map *map, void *value)
+ * long bpf_map_pop_elem(struct bpf_map *map, void *value)
  * 	Description
  * 		Pop an element from *map*.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_map_peek_elem(struct bpf_map *map, void *value)
+ * long bpf_map_peek_elem(struct bpf_map *map, void *value)
  * 	Description
  * 		Get an element from *map* without removing it.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_msg_push_data(struct sk_msg_buff *msg, u32 start, u32 len, u64 flags)
+ * long bpf_msg_push_data(struct sk_msg_buff *msg, u32 start, u32 len, u64 flags)
  *	Description
  *		For socket policies, insert *len* bytes into *msg* at offset
  *		*start*.
  *	Return
  *		0 on success, or a negative error in case of failure.
  *
- * int bpf_msg_pop_data(struct sk_msg_buff *msg, u32 start, u32 len, u64 flags)
+ * long bpf_msg_pop_data(struct sk_msg_buff *msg, u32 start, u32 len, u64 flags)
  *	Description
  *		Will remove *len* bytes from a *msg* starting at byte *start*.
  *		This may result in **ENOMEM** errors under certain situations if
  *	Return
  *		0 on success, or a negative error in case of failure.
  *
- * int bpf_rc_pointer_rel(void *ctx, s32 rel_x, s32 rel_y)
+ * long bpf_rc_pointer_rel(void *ctx, s32 rel_x, s32 rel_y)
  *	Description
  *		This helper is used in programs implementing IR decoding, to
  *		report a successfully decoded pointer movement.
  *	Return
  *		0
  *
- * int bpf_spin_lock(struct bpf_spin_lock *lock)
+ * long bpf_spin_lock(struct bpf_spin_lock *lock)
  *	Description
  *		Acquire a spinlock represented by the pointer *lock*, which is
  *		stored as part of a value of a map. Taking the lock allows to
  *	Return
  *		0
  *
- * int bpf_spin_unlock(struct bpf_spin_lock *lock)
+ * long bpf_spin_unlock(struct bpf_spin_lock *lock)
  *	Description
  *		Release the *lock* previously locked by a call to
  *		**bpf_spin_lock**\ (\ *lock*\ ).
  *		A **struct bpf_tcp_sock** pointer on success, or **NULL** in
  *		case of failure.
  *
- * int bpf_skb_ecn_set_ce(struct sk_buff *skb)
+ * long bpf_skb_ecn_set_ce(struct sk_buff *skb)
  *	Description
  *		Set ECN (Explicit Congestion Notification) field of IP header
  *		to **CE** (Congestion Encountered) if current value is **ECT**
  *		result is from *reuse*\ **->socks**\ [] using the hash of the
  *		tuple.
  *
- * int bpf_tcp_check_syncookie(struct bpf_sock *sk, void *iph, u32 iph_len, struct tcphdr *th, u32 th_len)
+ * long bpf_tcp_check_syncookie(struct bpf_sock *sk, void *iph, u32 iph_len, struct tcphdr *th, u32 th_len)
  * 	Description
  * 		Check whether *iph* and *th* contain a valid SYN cookie ACK for
  * 		the listening socket in *sk*.
  * 		0 if *iph* and *th* are a valid SYN cookie ACK, or a negative
  * 		error otherwise.
  *
- * int bpf_sysctl_get_name(struct bpf_sysctl *ctx, char *buf, size_t buf_len, u64 flags)
+ * long bpf_sysctl_get_name(struct bpf_sysctl *ctx, char *buf, size_t buf_len, u64 flags)
  *	Description
  *		Get name of sysctl in /proc/sys/ and copy it into provided by
  *		program buffer *buf* of size *buf_len*.
  *		**-E2BIG** if the buffer wasn't big enough (*buf* will contain
  *		truncated name in this case).
  *
- * int bpf_sysctl_get_current_value(struct bpf_sysctl *ctx, char *buf, size_t buf_len)
+ * long bpf_sysctl_get_current_value(struct bpf_sysctl *ctx, char *buf, size_t buf_len)
  *	Description
  *		Get current value of sysctl as it is presented in /proc/sys
  *		(incl. newline, etc), and copy it as a string into provided
  *		**-EINVAL** if current value was unavailable, e.g. because
  *		sysctl is uninitialized and read returns -EIO for it.
  *
- * int bpf_sysctl_get_new_value(struct bpf_sysctl *ctx, char *buf, size_t buf_len)
+ * long bpf_sysctl_get_new_value(struct bpf_sysctl *ctx, char *buf, size_t buf_len)
  *	Description
  *		Get new value being written by user space to sysctl (before
  *		the actual write happens) and copy it as a string into
  *
  *		**-EINVAL** if sysctl is being read.
  *
- * int bpf_sysctl_set_new_value(struct bpf_sysctl *ctx, const char *buf, size_t buf_len)
+ * long bpf_sysctl_set_new_value(struct bpf_sysctl *ctx, const char *buf, size_t buf_len)
  *	Description
  *		Override new value being written by user space to sysctl with
  *		value provided by program in buffer *buf* of size *buf_len*.
  *
  *		**-EINVAL** if sysctl is being read.
  *
- * int bpf_strtol(const char *buf, size_t buf_len, u64 flags, long *res)
+ * long bpf_strtol(const char *buf, size_t buf_len, u64 flags, long *res)
  *	Description
  *		Convert the initial part of the string from buffer *buf* of
  *		size *buf_len* to a long integer according to the given base
  *
  *		**-ERANGE** if resulting value was out of range.
  *
- * int bpf_strtoul(const char *buf, size_t buf_len, u64 flags, unsigned long *res)
+ * long bpf_strtoul(const char *buf, size_t buf_len, u64 flags, unsigned long *res)
  *	Description
  *		Convert the initial part of the string from buffer *buf* of
  *		size *buf_len* to an unsigned long integer according to the
  *		**NULL** if not found or there was an error in adding
  *		a new bpf-local-storage.
  *
- * int bpf_sk_storage_delete(struct bpf_map *map, struct bpf_sock *sk)
+ * long bpf_sk_storage_delete(struct bpf_map *map, struct bpf_sock *sk)
  *	Description
  *		Delete a bpf-local-storage from a *sk*.
  *	Return
  *
  *		**-ENOENT** if the bpf-local-storage cannot be found.
  *
- * int bpf_send_signal(u32 sig)
+ * long bpf_send_signal(u32 sig)
  *	Description
  *		Send signal *sig* to the process of the current task.
  *		The signal may be delivered to any of this process's threads.
  *
  *		**-EPROTONOSUPPORT** IP packet version is not 4 or 6
  *
- * int bpf_skb_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
+ * long bpf_skb_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
  * 	Description
  * 		Write raw *data* blob into a special BPF perf event held by
  * 		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_probe_read_user(void *dst, u32 size, const void *unsafe_ptr)
+ * long bpf_probe_read_user(void *dst, u32 size, const void *unsafe_ptr)
  * 	Description
  * 		Safely attempt to read *size* bytes from user space address
  * 		*unsafe_ptr* and store the data in *dst*.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_probe_read_kernel(void *dst, u32 size, const void *unsafe_ptr)
+ * long bpf_probe_read_kernel(void *dst, u32 size, const void *unsafe_ptr)
  * 	Description
  * 		Safely attempt to read *size* bytes from kernel space address
  * 		*unsafe_ptr* and store the data in *dst*.
  * 	Return
  * 		0 on success, or a negative error in case of failure.
  *
- * int bpf_probe_read_user_str(void *dst, u32 size, const void *unsafe_ptr)
+ * long bpf_probe_read_user_str(void *dst, u32 size, const void *unsafe_ptr)
  * 	Description
  * 		Copy a NUL terminated string from an unsafe user address
  * 		*unsafe_ptr* to *dst*. The *size* should include the
  * 		including the trailing NUL character. On error, a negative
  * 		value.
  *
- * int bpf_probe_read_kernel_str(void *dst, u32 size, const void *unsafe_ptr)
+ * long bpf_probe_read_kernel_str(void *dst, u32 size, const void *unsafe_ptr)
  * 	Description
  * 		Copy a NUL terminated string from an unsafe kernel address *unsafe_ptr*
  * 		to *dst*. Same semantics as with **bpf_probe_read_user_str**\ () apply.
  * 		On success, the strictly positive length of the string, including
  * 		the trailing NUL character. On error, a negative value.
  *
- * int bpf_tcp_send_ack(void *tp, u32 rcv_nxt)
+ * long bpf_tcp_send_ack(void *tp, u32 rcv_nxt)
  *	Description
  *		Send out a tcp-ack. *tp* is the in-kernel struct **tcp_sock**.
  *		*rcv_nxt* is the ack_seq to be sent out.
  *	Return
  *		0 on success, or a negative error in case of failure.
  *
- * int bpf_send_signal_thread(u32 sig)
+ * long bpf_send_signal_thread(u32 sig)
  *	Description
  *		Send signal *sig* to the thread corresponding to the current task.
  *	Return
  *	Return
  *		The 64 bit jiffies
  *
- * int bpf_read_branch_records(struct bpf_perf_event_data *ctx, void *buf, u32 size, u64 flags)
+ * long bpf_read_branch_records(struct bpf_perf_event_data *ctx, void *buf, u32 size, u64 flags)
  *	Description
  *		For an eBPF program attached to a perf event, retrieve the
  *		branch records (**struct perf_branch_entry**) associated to *ctx*
  *
  *		**-ENOENT** if architecture does not support branch records.
  *
- * int bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size)
+ * long bpf_get_ns_current_pid_tgid(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size)
  *	Description
  *		Returns 0 on success, values for *pid* and *tgid* as seen from the current
  *		*namespace* will be returned in *nsdata*.
  *
  *		**-ENOENT** if pidns does not exists for the current task.
  *
- * int bpf_xdp_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
+ * long bpf_xdp_output(void *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
  *	Description
  *		Write raw *data* blob into a special BPF perf event held by
  *		*map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
  * 	Return
  * 		The id is returned or 0 in case the id could not be retrieved.
  *
- * int bpf_sk_assign(struct sk_buff *skb, struct bpf_sock *sk, u64 flags)
+ * long bpf_sk_assign(struct sk_buff *skb, struct bpf_sock *sk, u64 flags)
  *	Description
+ *		Helper is overloaded depending on BPF program type. This
+ *		description applies to **BPF_PROG_TYPE_SCHED_CLS** and
+ *		**BPF_PROG_TYPE_SCHED_ACT** programs.
+ *
  *		Assign the *sk* to the *skb*. When combined with appropriate
  *		routing configuration to receive the packet towards the socket,
  *		will cause *skb* to be delivered to the specified socket.
  *		**-ESOCKTNOSUPPORT** if the socket type is not supported
  *		(reuseport).
  *
+ * long bpf_sk_assign(struct bpf_sk_lookup *ctx, struct bpf_sock *sk, u64 flags)
+ *	Description
+ *		Helper is overloaded depending on BPF program type. This
+ *		description applies to **BPF_PROG_TYPE_SK_LOOKUP** programs.
+ *
+ *		Select the *sk* as a result of a socket lookup.
+ *
+ *		For the operation to succeed passed socket must be compatible
+ *		with the packet description provided by the *ctx* object.
+ *
+ *		L4 protocol (**IPPROTO_TCP** or **IPPROTO_UDP**) must
+ *		be an exact match. While IP family (**AF_INET** or
+ *		**AF_INET6**) must be compatible, that is IPv6 sockets
+ *		that are not v6-only can be selected for IPv4 packets.
+ *
+ *		Only TCP listeners and UDP unconnected sockets can be
+ *		selected. *sk* can also be NULL to reset any previous
+ *		selection.
+ *
+ *		*flags* argument can combination of following values:
+ *
+ *		* **BPF_SK_LOOKUP_F_REPLACE** to override the previous
+ *		  socket selection, potentially done by a BPF program
+ *		  that ran before us.
+ *
+ *		* **BPF_SK_LOOKUP_F_NO_REUSEPORT** to skip
+ *		  load-balancing within reuseport group for the socket
+ *		  being selected.
+ *
+ *		On success *ctx->sk* will point to the selected socket.
+ *
+ *	Return
+ *		0 on success, or a negative errno in case of failure.
+ *
+ *		* **-EAFNOSUPPORT** if socket family (*sk->family*) is
+ *		  not compatible with packet family (*ctx->family*).
+ *
+ *		* **-EEXIST** if socket has been already selected,
+ *		  potentially by another program, and
+ *		  **BPF_SK_LOOKUP_F_REPLACE** flag was not specified.
+ *
+ *		* **-EINVAL** if unsupported flags were specified.
+ *
+ *		* **-EPROTOTYPE** if socket L4 protocol
+ *		  (*sk->protocol*) doesn't match packet protocol
+ *		  (*ctx->protocol*).
+ *
+ *		* **-ESOCKTNOSUPPORT** if socket is not in allowed
+ *		  state (TCP listening or UDP unconnected).
+ *
  * u64 bpf_ktime_get_boot_ns(void)
  * 	Description
  * 		Return the time elapsed since system boot, in nanoseconds.
  * 	Return
  * 		Current *ktime*.
  *
- * int bpf_seq_printf(struct seq_file *m, const char *fmt, u32 fmt_size, const void *data, u32 data_len)
+ * long bpf_seq_printf(struct seq_file *m, const char *fmt, u32 fmt_size, const void *data, u32 data_len)
  * 	Description
  * 		**bpf_seq_printf**\ () uses seq_file **seq_printf**\ () to print
  * 		out the format string.
  *
  *		**-EOVERFLOW** if an overflow happened: The same object will be tried again.
  *
- * int bpf_seq_write(struct seq_file *m, const void *data, u32 len)
+ * long bpf_seq_write(struct seq_file *m, const void *data, u32 len)
  * 	Description
  * 		**bpf_seq_write**\ () uses seq_file **seq_write**\ () to write the data.
  * 		The *m* represents the seq_file. The *data* and *len* represent the
  *	Return
  *		The id is returned or 0 in case the id could not be retrieved.
  *
- * int bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)
+ * long bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)
  * 	Description
  * 		Copy *size* bytes from *data* into a ring buffer *ringbuf*.
  * 		If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
  *	Return
  *		Requested value, or 0, if *flags* are not recognized.
  *
- * int bpf_csum_level(struct sk_buff *skb, u64 level)
+ * long bpf_csum_level(struct sk_buff *skb, u64 level)
  * 	Description
  * 		Change the skbs checksum level by one layer up or down, or
  * 		reset it entirely to none in order to have the stack perform
  * 		case of **BPF_CSUM_LEVEL_QUERY**, the current skb->csum_level
  * 		is returned or the error code -EACCES in case the skb is not
  * 		subject to CHECKSUM_UNNECESSARY.
+ *
+ * struct tcp6_sock *bpf_skc_to_tcp6_sock(void *sk)
+ *	Description
+ *		Dynamically cast a *sk* pointer to a *tcp6_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or NULL otherwise.
+ *
+ * struct tcp_sock *bpf_skc_to_tcp_sock(void *sk)
+ *	Description
+ *		Dynamically cast a *sk* pointer to a *tcp_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or NULL otherwise.
+ *
+ * struct tcp_timewait_sock *bpf_skc_to_tcp_timewait_sock(void *sk)
+ * 	Description
+ *		Dynamically cast a *sk* pointer to a *tcp_timewait_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or NULL otherwise.
+ *
+ * struct tcp_request_sock *bpf_skc_to_tcp_request_sock(void *sk)
+ * 	Description
+ *		Dynamically cast a *sk* pointer to a *tcp_request_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or NULL otherwise.
+ *
+ * struct udp6_sock *bpf_skc_to_udp6_sock(void *sk)
+ * 	Description
+ *		Dynamically cast a *sk* pointer to a *udp6_sock* pointer.
+ *	Return
+ *		*sk* if casting is valid, or NULL otherwise.
+ *
+ * long bpf_get_task_stack(struct task_struct *task, void *buf, u32 size, u64 flags)
+ *	Description
+ *		Return a user or a kernel stack in bpf program provided buffer.
+ *		To achieve this, the helper needs *task*, which is a valid
+ *		pointer to struct task_struct. To store the stacktrace, the
+ *		bpf program provides *buf* with	a nonnegative *size*.
+ *
+ *		The last argument, *flags*, holds the number of stack frames to
+ *		skip (from 0 to 255), masked with
+ *		**BPF_F_SKIP_FIELD_MASK**. The next bits can be used to set
+ *		the following flags:
+ *
+ *		**BPF_F_USER_STACK**
+ *			Collect a user space stack instead of a kernel stack.
+ *		**BPF_F_USER_BUILD_ID**
+ *			Collect buildid+offset instead of ips for user stack,
+ *			only valid if **BPF_F_USER_STACK** is also specified.
+ *
+ *		**bpf_get_task_stack**\ () can collect up to
+ *		**PERF_MAX_STACK_DEPTH** both kernel and user frames, subject
+ *		to sufficient large buffer size. Note that
+ *		this limit can be controlled with the **sysctl** program, and
+ *		that it should be manually increased in order to profile long
+ *		user stacks (such as stacks for Java programs). To do so, use:
+ *
+ *		::
+ *
+ *			# sysctl kernel.perf_event_max_stack=<new value>
+ *	Return
+ *		A non-negative value equal to or less than *size* on success,
+ *		or a negative error in case of failure.
+ *
  */
 #define __BPF_FUNC_MAPPER(FN)		\
 	FN(unspec),			\
 	FN(ringbuf_submit),		\
 	FN(ringbuf_discard),		\
 	FN(ringbuf_query),		\
-	FN(csum_level),
+	FN(csum_level),			\
+	FN(skc_to_tcp6_sock),		\
+	FN(skc_to_tcp_sock),		\
+	FN(skc_to_tcp_timewait_sock),	\
+	FN(skc_to_tcp_request_sock),	\
+	FN(skc_to_udp6_sock),		\
+	FN(get_task_stack),		\
+	/* */
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
 	BPF_RINGBUF_HDR_SZ		= 8,
 };
+/* BPF_FUNC_sk_assign flags in bpf_sk_lookup context. */
+enum {
+	BPF_SK_LOOKUP_F_REPLACE		= (1ULL << 0),
+	BPF_SK_LOOKUP_F_NO_REUSEPORT	= (1ULL << 1),
+};
 /* Mode for BPF_FUNC_skb_adjust_room helper. */
 enum bpf_adj_room_mode {
 	BPF_ADJ_ROOM_NET,
 	} bpf_prog;
 };
+/* CPUMAP map-value layout
+ *
+ * The struct data-layout of map-value is a configuration interface.
+ * New members can only be added to the end of this structure.
+ */
+struct bpf_cpumap_val {
+	__u32 qsize;	/* queue size to remote target CPU */
+	union {
+		int   fd;	/* prog fd on map write */
+		__u32 id;	/* prog id on map read */
+	} bpf_prog;
+};
 enum sk_action {
 	SK_DROP = 0,
 	SK_PASS,
 			__u32 netns_ino;
 			__u32 attach_type;
 		} netns;
+		struct {
+			__u32 ifindex;
+		} xdp;
 	};
 } __attribute__((aligned(8)));
 /* User bpf_sock_addr struct to access socket fields and sockaddr struct passed
  * by user and intended to be used by socket (e.g. to bind to, depends on
- * attach attach type).
+ * attach type).
  */
 struct bpf_sock_addr {
 	__u32 user_family;	/* Allows 4-byte read, but no write. */
 	__u32 pid;
 	__u32 tgid;
 };
+/* User accessible data for SK_LOOKUP programs. Add new fields at the end. */
+struct bpf_sk_lookup {
+	__bpf_md_ptr(struct bpf_sock *, sk); /* Selected socket */
+	__u32 family;		/* Protocol family (AF_INET, AF_INET6) */
+	__u32 protocol;		/* IP protocol (IPPROTO_TCP, IPPROTO_UDP) */
+	__u32 remote_ip4;	/* Network byte order */
+	__u32 remote_ip6[4];	/* Network byte order */
+	__u32 remote_port;	/* Network byte order */
+	__u32 local_ip4;	/* Network byte order */
+	__u32 local_ip6[4];	/* Network byte order */
+	__u32 local_port;	/* Host byte order */
+};
 #endif /* _UAPI__LINUX_BPF_H__ */

include/uapi/linux/caif/caif_socket.h+1−1

@@ -169,7 +169,7 @@ struct sockaddr_caif { · 168 unmodified lines
169	* @CAIFSO_LINK_SELECT: Selector used if multiple CAIF Link layers are	169	* @CAIFSO_LINK_SELECT: Selector used if multiple CAIF Link layers are
170	* available. Either a high bandwidth	170	* available. Either a high bandwidth
171	* link can be selected (CAIF_LINK_HIGH_BANDW) or	171	* link can be selected (CAIF_LINK_HIGH_BANDW) or
172	* or a low latency link (CAIF_LINK_LOW_LATENCY).	172	* a low latency link (CAIF_LINK_LOW_LATENCY).
173	* This option is of type __u32.	173	* This option is of type __u32.
174	* Alternatively SO_BINDTODEVICE can be used.	174	* Alternatively SO_BINDTODEVICE can be used.
175	*	175	*

include/uapi/linux/devlink.h+15−0

@@ -451,6 +451,13 @@ enum devlink_attr { · 450 unmodified lines
451	DEVLINK_ATTR_TRAP_POLICER_RATE, /* u64 */	451	DEVLINK_ATTR_TRAP_POLICER_RATE, /* u64 */
452	DEVLINK_ATTR_TRAP_POLICER_BURST, /* u64 */	452	DEVLINK_ATTR_TRAP_POLICER_BURST, /* u64 */
453		453
		454	DEVLINK_ATTR_PORT_FUNCTION, /* nested */
		455
		456	DEVLINK_ATTR_INFO_BOARD_SERIAL_NUMBER, /* string */
		457
		458	DEVLINK_ATTR_PORT_LANES, /* u32 */
		459	DEVLINK_ATTR_PORT_SPLITTABLE, /* u8 */
		460
454	/* add new attributes above here, update the policy in devlink.c */	461	/* add new attributes above here, update the policy in devlink.c */
455		462
456	__DEVLINK_ATTR_MAX,	463	__DEVLINK_ATTR_MAX,
@@ -497,4 +504,12 @@ enum devlink_resource_unit { · 40 unmodified lines
497	DEVLINK_RESOURCE_UNIT_ENTRY,	504	DEVLINK_RESOURCE_UNIT_ENTRY,
498	};	505	};
499		506
		507	enum devlink_port_function_attr {
		508	DEVLINK_PORT_FUNCTION_ATTR_UNSPEC,
		509	DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR, /* binary */
		510
		511	__DEVLINK_PORT_FUNCTION_ATTR_MAX,
		512	DEVLINK_PORT_FUNCTION_ATTR_MAX = __DEVLINK_PORT_FUNCTION_ATTR_MAX - 1
		513	};
		514
500	#endif /* _UAPI_LINUX_DEVLINK_H_ */	515	#endif /* _UAPI_LINUX_DEVLINK_H_ */

include/uapi/linux/errqueue.h+13−1

 #include <linux/types.h>
 #include <linux/time_types.h>
+/* RFC 4884: return offset to extension struct + validation */
+struct sock_ee_data_rfc4884 {
+	__u16	len;
+	__u8	flags;
+	__u8	reserved;
+};
 struct sock_extended_err {
 	__u32	ee_errno;
 	__u8	ee_origin;
 	__u8	ee_code;
 	__u8	ee_pad;
 	__u32   ee_info;
-	__u32   ee_data;
+	union	{
+		__u32   ee_data;
+		struct sock_ee_data_rfc4884 ee_rfc4884;
+	};
 };
 #define SO_EE_ORIGIN_NONE	0
 #define SO_EE_CODE_TXTIME_INVALID_PARAM	1
 #define SO_EE_CODE_TXTIME_MISSED	2
+#define SO_EE_RFC4884_FLAG_INVALID	1
 /**
  *	struct scm_timestamping - timestamps exposed through cmsg
  *

include/uapi/linux/ethtool.h+87−0

@@ -579,6 +579,76 @@ struct ethtool_pauseparam { · 578 unmodified lines
579	__u32 tx_pause;	579	__u32 tx_pause;
580	};	580	};
581		581
		582	/**
		583	* enum ethtool_link_ext_state - link extended state
		584	*/
		585	enum ethtool_link_ext_state {
		586	ETHTOOL_LINK_EXT_STATE_AUTONEG,
		587	ETHTOOL_LINK_EXT_STATE_LINK_TRAINING_FAILURE,
		588	ETHTOOL_LINK_EXT_STATE_LINK_LOGICAL_MISMATCH,
		589	ETHTOOL_LINK_EXT_STATE_BAD_SIGNAL_INTEGRITY,
		590	ETHTOOL_LINK_EXT_STATE_NO_CABLE,
		591	ETHTOOL_LINK_EXT_STATE_CABLE_ISSUE,
		592	ETHTOOL_LINK_EXT_STATE_EEPROM_ISSUE,
		593	ETHTOOL_LINK_EXT_STATE_CALIBRATION_FAILURE,
		594	ETHTOOL_LINK_EXT_STATE_POWER_BUDGET_EXCEEDED,
		595	ETHTOOL_LINK_EXT_STATE_OVERHEAT,
		596	};
		597
		598	/**
		599	* enum ethtool_link_ext_substate_autoneg - more information in addition to
		600	* ETHTOOL_LINK_EXT_STATE_AUTONEG.
		601	*/
		602	enum ethtool_link_ext_substate_autoneg {
		603	ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_PARTNER_DETECTED = 1,
		604	ETHTOOL_LINK_EXT_SUBSTATE_AN_ACK_NOT_RECEIVED,
		605	ETHTOOL_LINK_EXT_SUBSTATE_AN_NEXT_PAGE_EXCHANGE_FAILED,
		606	ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_PARTNER_DETECTED_FORCE_MODE,
		607	ETHTOOL_LINK_EXT_SUBSTATE_AN_FEC_MISMATCH_DURING_OVERRIDE,
		608	ETHTOOL_LINK_EXT_SUBSTATE_AN_NO_HCD,
		609	};
		610
		611	/**
		612	* enum ethtool_link_ext_substate_link_training - more information in addition to
		613	* ETHTOOL_LINK_EXT_STATE_LINK_TRAINING_FAILURE.
		614	*/
		615	enum ethtool_link_ext_substate_link_training {
		616	ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_FRAME_LOCK_NOT_ACQUIRED = 1,
		617	ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_LINK_INHIBIT_TIMEOUT,
		618	ETHTOOL_LINK_EXT_SUBSTATE_LT_KR_LINK_PARTNER_DID_NOT_SET_RECEIVER_READY,
		619	ETHTOOL_LINK_EXT_SUBSTATE_LT_REMOTE_FAULT,
		620	};
		621
		622	/**
		623	* enum ethtool_link_ext_substate_logical_mismatch - more information in addition
		624	* to ETHTOOL_LINK_EXT_STATE_LINK_LOGICAL_MISMATCH.
		625	*/
		626	enum ethtool_link_ext_substate_link_logical_mismatch {
		627	ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_ACQUIRE_BLOCK_LOCK = 1,
		628	ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_ACQUIRE_AM_LOCK,
		629	ETHTOOL_LINK_EXT_SUBSTATE_LLM_PCS_DID_NOT_GET_ALIGN_STATUS,
		630	ETHTOOL_LINK_EXT_SUBSTATE_LLM_FC_FEC_IS_NOT_LOCKED,
		631	ETHTOOL_LINK_EXT_SUBSTATE_LLM_RS_FEC_IS_NOT_LOCKED,
		632	};
		633
		634	/**
		635	* enum ethtool_link_ext_substate_bad_signal_integrity - more information in
		636	* addition to ETHTOOL_LINK_EXT_STATE_BAD_SIGNAL_INTEGRITY.
		637	*/
		638	enum ethtool_link_ext_substate_bad_signal_integrity {
		639	ETHTOOL_LINK_EXT_SUBSTATE_BSI_LARGE_NUMBER_OF_PHYSICAL_ERRORS = 1,
		640	ETHTOOL_LINK_EXT_SUBSTATE_BSI_UNSUPPORTED_RATE,
		641	};
		642
		643	/**
		644	* enum ethtool_link_ext_substate_cable_issue - more information in
		645	* addition to ETHTOOL_LINK_EXT_STATE_CABLE_ISSUE.
		646	*/
		647	enum ethtool_link_ext_substate_cable_issue {
		648	ETHTOOL_LINK_EXT_SUBSTATE_CI_UNSUPPORTED_CABLE = 1,
		649	ETHTOOL_LINK_EXT_SUBSTATE_CI_CABLE_TEST_FAILURE,
		650	};
		651
582	#define ETH_GSTRING_LEN 32	652	#define ETH_GSTRING_LEN 32
583		653
584	/**	654	/**
@@ -599,6 +669,7 @@ struct ethtool_pauseparam { · 14 unmodified lines
599	* @ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags	669	* @ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags
600	* @ETH_SS_TS_TX_TYPES: timestamping Tx types	670	* @ETH_SS_TS_TX_TYPES: timestamping Tx types
601	* @ETH_SS_TS_RX_FILTERS: timestamping Rx filters	671	* @ETH_SS_TS_RX_FILTERS: timestamping Rx filters
		672	* @ETH_SS_UDP_TUNNEL_TYPES: UDP tunnel types
602	*/	673	*/
603	enum ethtool_stringset {	674	enum ethtool_stringset {
604	ETH_SS_TEST = 0,	675	ETH_SS_TEST = 0,
@@ -616,6 +687,7 @@ enum ethtool_stringset { · 11 unmodified lines
616	ETH_SS_SOF_TIMESTAMPING,	687	ETH_SS_SOF_TIMESTAMPING,
617	ETH_SS_TS_TX_TYPES,	688	ETH_SS_TS_TX_TYPES,
618	ETH_SS_TS_RX_FILTERS,	689	ETH_SS_TS_RX_FILTERS,
		690	ETH_SS_UDP_TUNNEL_TYPES,
619		691
620	/* add new constants above here */	692	/* add new constants above here */
621	ETH_SS_COUNT	693	ETH_SS_COUNT
@@ -1530,6 +1602,21 @@ enum ethtool_link_mode_bit_indices { · 908 unmodified lines
1530	ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT = 72,	1602	ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT = 72,
1531	ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT = 73,	1603	ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT = 73,
1532	ETHTOOL_LINK_MODE_FEC_LLRS_BIT = 74,	1604	ETHTOOL_LINK_MODE_FEC_LLRS_BIT = 74,
		1605	ETHTOOL_LINK_MODE_100000baseKR_Full_BIT = 75,
		1606	ETHTOOL_LINK_MODE_100000baseSR_Full_BIT = 76,
		1607	ETHTOOL_LINK_MODE_100000baseLR_ER_FR_Full_BIT = 77,
		1608	ETHTOOL_LINK_MODE_100000baseCR_Full_BIT = 78,
		1609	ETHTOOL_LINK_MODE_100000baseDR_Full_BIT = 79,
		1610	ETHTOOL_LINK_MODE_200000baseKR2_Full_BIT = 80,
		1611	ETHTOOL_LINK_MODE_200000baseSR2_Full_BIT = 81,
		1612	ETHTOOL_LINK_MODE_200000baseLR2_ER2_FR2_Full_BIT = 82,
		1613	ETHTOOL_LINK_MODE_200000baseDR2_Full_BIT = 83,
		1614	ETHTOOL_LINK_MODE_200000baseCR2_Full_BIT = 84,
		1615	ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT = 85,
		1616	ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT = 86,
		1617	ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT = 87,
		1618	ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT = 88,
		1619	ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT = 89,
1533	/* must be last entry */	1620	/* must be last entry */
1534	__ETHTOOL_LINK_MODE_MASK_NBITS	1621	__ETHTOOL_LINK_MODE_MASK_NBITS
1535	};	1622	};

include/uapi/linux/ethtool_netlink.h+57−0

@@ -41,6 +41,7 @@ enum { · 40 unmodified lines
41	ETHTOOL_MSG_TSINFO_GET,	41	ETHTOOL_MSG_TSINFO_GET,
42	ETHTOOL_MSG_CABLE_TEST_ACT,	42	ETHTOOL_MSG_CABLE_TEST_ACT,
43	ETHTOOL_MSG_CABLE_TEST_TDR_ACT,	43	ETHTOOL_MSG_CABLE_TEST_TDR_ACT,
		44	ETHTOOL_MSG_TUNNEL_INFO_GET,
44		45
45	/* add new constants above here */	46	/* add new constants above here */
46	__ETHTOOL_MSG_USER_CNT,	47	__ETHTOOL_MSG_USER_CNT,
@@ -236,6 +237,8 @@ enum { · 189 unmodified lines
236	ETHTOOL_A_LINKSTATE_LINK, /* u8 */	237	ETHTOOL_A_LINKSTATE_LINK, /* u8 */
237	ETHTOOL_A_LINKSTATE_SQI, /* u32 */	238	ETHTOOL_A_LINKSTATE_SQI, /* u32 */
238	ETHTOOL_A_LINKSTATE_SQI_MAX, /* u32 */	239	ETHTOOL_A_LINKSTATE_SQI_MAX, /* u32 */
		240	ETHTOOL_A_LINKSTATE_EXT_STATE, /* u8 */
		241	ETHTOOL_A_LINKSTATE_EXT_SUBSTATE, /* u8 */
239		242
240	/* add new constants above here */	243	/* add new constants above here */
241	__ETHTOOL_A_LINKSTATE_CNT,	244	__ETHTOOL_A_LINKSTATE_CNT,
@@ -554,6 +557,60 @@ enum { · 312 unmodified lines
554	ETHTOOL_A_CABLE_TEST_TDR_NTF_MAX = __ETHTOOL_A_CABLE_TEST_TDR_NTF_CNT - 1	557	ETHTOOL_A_CABLE_TEST_TDR_NTF_MAX = __ETHTOOL_A_CABLE_TEST_TDR_NTF_CNT - 1
555	};	558	};
556		559
		560	/* TUNNEL INFO */
		561
		562	enum {
		563	ETHTOOL_UDP_TUNNEL_TYPE_VXLAN,
		564	ETHTOOL_UDP_TUNNEL_TYPE_GENEVE,
		565	ETHTOOL_UDP_TUNNEL_TYPE_VXLAN_GPE,
		566
		567	__ETHTOOL_UDP_TUNNEL_TYPE_CNT
		568	};
		569
		570	enum {
		571	ETHTOOL_A_TUNNEL_UDP_ENTRY_UNSPEC,
		572
		573	ETHTOOL_A_TUNNEL_UDP_ENTRY_PORT, /* be16 */
		574	ETHTOOL_A_TUNNEL_UDP_ENTRY_TYPE, /* u32 */
		575
		576	/* add new constants above here */
		577	__ETHTOOL_A_TUNNEL_UDP_ENTRY_CNT,
		578	ETHTOOL_A_TUNNEL_UDP_ENTRY_MAX = (__ETHTOOL_A_TUNNEL_UDP_ENTRY_CNT - 1)
		579	};
		580
		581	enum {
		582	ETHTOOL_A_TUNNEL_UDP_TABLE_UNSPEC,
		583
		584	ETHTOOL_A_TUNNEL_UDP_TABLE_SIZE, /* u32 */
		585	ETHTOOL_A_TUNNEL_UDP_TABLE_TYPES, /* bitset */
		586	ETHTOOL_A_TUNNEL_UDP_TABLE_ENTRY, /* nest - _UDP_ENTRY_* */
		587
		588	/* add new constants above here */
		589	__ETHTOOL_A_TUNNEL_UDP_TABLE_CNT,
		590	ETHTOOL_A_TUNNEL_UDP_TABLE_MAX = (__ETHTOOL_A_TUNNEL_UDP_TABLE_CNT - 1)
		591	};
		592
		593	enum {
		594	ETHTOOL_A_TUNNEL_UDP_UNSPEC,
		595
		596	ETHTOOL_A_TUNNEL_UDP_TABLE, /* nest - _UDP_TABLE_* */
		597
		598	/* add new constants above here */
		599	__ETHTOOL_A_TUNNEL_UDP_CNT,
		600	ETHTOOL_A_TUNNEL_UDP_MAX = (__ETHTOOL_A_TUNNEL_UDP_CNT - 1)
		601	};
		602
		603	enum {
		604	ETHTOOL_A_TUNNEL_INFO_UNSPEC,
		605	ETHTOOL_A_TUNNEL_INFO_HEADER, /* nest - _A_HEADER_* */
		606
		607	ETHTOOL_A_TUNNEL_INFO_UDP_PORTS, /* nest - _UDP_TABLE */
		608
		609	/* add new constants above here */
		610	__ETHTOOL_A_TUNNEL_INFO_CNT,
		611	ETHTOOL_A_TUNNEL_INFO_MAX = (__ETHTOOL_A_TUNNEL_INFO_CNT - 1)
		612	};
		613
557	/* generic netlink info */	614	/* generic netlink info */
558	#define ETHTOOL_GENL_NAME "ethtool"	615	#define ETHTOOL_GENL_NAME "ethtool"
559	#define ETHTOOL_GENL_VERSION 1	616	#define ETHTOOL_GENL_VERSION 1

include/uapi/linux/hsr_netlink.h+1−1

@@ -17,7 +17,7 @@ · 16 unmodified lines
17	/* Generic Netlink HSR family definition	17	/* Generic Netlink HSR family definition
18	*/	18	*/
19		19
20	/* attributes */	20	/* attributes for HSR or PRP node */
21	enum {	21	enum {
22	HSR_A_UNSPEC,	22	HSR_A_UNSPEC,
23	HSR_A_NODE_ADDR,	23	HSR_A_NODE_ADDR,

include/uapi/linux/icmp.h+22−0

@@ -19,6 +19,7 @@ · 18 unmodified lines
19	#define _UAPI_LINUX_ICMP_H	19	#define _UAPI_LINUX_ICMP_H
20		20
21	#include <linux/types.h>	21	#include <linux/types.h>
		22	#include <asm/byteorder.h>
22		23
23	#define ICMP_ECHOREPLY 0 /* Echo Reply */	24	#define ICMP_ECHOREPLY 0 /* Echo Reply */
24	#define ICMP_DEST_UNREACH 3 /* Destination Unreachable */	25	#define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
@@ -95,5 +96,26 @@ struct icmp_filter { · 70 unmodified lines
95	__u32 data;	96	__u32 data;
96	};	97	};
97		98
		99	/* RFC 4884 extension struct: one per message */
		100	struct icmp_ext_hdr {
		101	#if defined(__LITTLE_ENDIAN_BITFIELD)
		102	__u8 reserved1:4,
		103	version:4;
		104	#elif defined(__BIG_ENDIAN_BITFIELD)
		105	__u8 version:4,
		106	reserved1:4;
		107	#else
		108	#error "Please fix <asm/byteorder.h>"
		109	#endif
		110	__u8 reserved2;
		111	__sum16 checksum;
		112	};
		113
		114	/* RFC 4884 extension object header: one for each object */
		115	struct icmp_extobj_hdr {
		116	__be16 length;
		117	__u8 class_num;
		118	__u8 class_type;
		119	};
98		120
99	#endif /* _UAPI_LINUX_ICMP_H */	121	#endif /* _UAPI_LINUX_ICMP_H */

include/uapi/linux/icmpv6.h+1−0

@@ -68,6 +68,7 @@ struct icmp6hdr { · 67 unmodified lines
68	#define icmp6_mtu icmp6_dataun.un_data32[0]	68	#define icmp6_mtu icmp6_dataun.un_data32[0]
69	#define icmp6_unused icmp6_dataun.un_data32[0]	69	#define icmp6_unused icmp6_dataun.un_data32[0]
70	#define icmp6_maxdelay icmp6_dataun.un_data16[0]	70	#define icmp6_maxdelay icmp6_dataun.un_data16[0]
		71	#define icmp6_datagram_len icmp6_dataun.un_data8[0]
71	#define icmp6_router icmp6_dataun.u_nd_advt.router	72	#define icmp6_router icmp6_dataun.u_nd_advt.router
72	#define icmp6_solicited icmp6_dataun.u_nd_advt.solicited	73	#define icmp6_solicited icmp6_dataun.u_nd_advt.solicited
73	#define icmp6_override icmp6_dataun.u_nd_advt.override	74	#define icmp6_override icmp6_dataun.u_nd_advt.override

include/uapi/linux/if_bridge.h+75−0

@@ -166,6 +166,10 @@ enum { · 165 unmodified lines
166	IFLA_BRIDGE_MRP_RING_STATE,	166	IFLA_BRIDGE_MRP_RING_STATE,
167	IFLA_BRIDGE_MRP_RING_ROLE,	167	IFLA_BRIDGE_MRP_RING_ROLE,
168	IFLA_BRIDGE_MRP_START_TEST,	168	IFLA_BRIDGE_MRP_START_TEST,
		169	IFLA_BRIDGE_MRP_INFO,
		170	IFLA_BRIDGE_MRP_IN_ROLE,
		171	IFLA_BRIDGE_MRP_IN_STATE,
		172	IFLA_BRIDGE_MRP_START_IN_TEST,
169	__IFLA_BRIDGE_MRP_MAX,	173	__IFLA_BRIDGE_MRP_MAX,
170	};	174	};
171		175
@@ -228,6 +232,58 @@ enum { · 56 unmodified lines
228		232
229	#define IFLA_BRIDGE_MRP_START_TEST_MAX (__IFLA_BRIDGE_MRP_START_TEST_MAX - 1)	233	#define IFLA_BRIDGE_MRP_START_TEST_MAX (__IFLA_BRIDGE_MRP_START_TEST_MAX - 1)
230		234
		235	enum {
		236	IFLA_BRIDGE_MRP_INFO_UNSPEC,
		237	IFLA_BRIDGE_MRP_INFO_RING_ID,
		238	IFLA_BRIDGE_MRP_INFO_P_IFINDEX,
		239	IFLA_BRIDGE_MRP_INFO_S_IFINDEX,
		240	IFLA_BRIDGE_MRP_INFO_PRIO,
		241	IFLA_BRIDGE_MRP_INFO_RING_STATE,
		242	IFLA_BRIDGE_MRP_INFO_RING_ROLE,
		243	IFLA_BRIDGE_MRP_INFO_TEST_INTERVAL,
		244	IFLA_BRIDGE_MRP_INFO_TEST_MAX_MISS,
		245	IFLA_BRIDGE_MRP_INFO_TEST_MONITOR,
		246	IFLA_BRIDGE_MRP_INFO_I_IFINDEX,
		247	IFLA_BRIDGE_MRP_INFO_IN_STATE,
		248	IFLA_BRIDGE_MRP_INFO_IN_ROLE,
		249	IFLA_BRIDGE_MRP_INFO_IN_TEST_INTERVAL,
		250	IFLA_BRIDGE_MRP_INFO_IN_TEST_MAX_MISS,
		251	__IFLA_BRIDGE_MRP_INFO_MAX,
		252	};
		253
		254	#define IFLA_BRIDGE_MRP_INFO_MAX (__IFLA_BRIDGE_MRP_INFO_MAX - 1)
		255
		256	enum {
		257	IFLA_BRIDGE_MRP_IN_STATE_UNSPEC,
		258	IFLA_BRIDGE_MRP_IN_STATE_IN_ID,
		259	IFLA_BRIDGE_MRP_IN_STATE_STATE,
		260	__IFLA_BRIDGE_MRP_IN_STATE_MAX,
		261	};
		262
		263	#define IFLA_BRIDGE_MRP_IN_STATE_MAX (__IFLA_BRIDGE_MRP_IN_STATE_MAX - 1)
		264
		265	enum {
		266	IFLA_BRIDGE_MRP_IN_ROLE_UNSPEC,
		267	IFLA_BRIDGE_MRP_IN_ROLE_RING_ID,
		268	IFLA_BRIDGE_MRP_IN_ROLE_IN_ID,
		269	IFLA_BRIDGE_MRP_IN_ROLE_ROLE,
		270	IFLA_BRIDGE_MRP_IN_ROLE_I_IFINDEX,
		271	__IFLA_BRIDGE_MRP_IN_ROLE_MAX,
		272	};
		273
		274	#define IFLA_BRIDGE_MRP_IN_ROLE_MAX (__IFLA_BRIDGE_MRP_IN_ROLE_MAX - 1)
		275
		276	enum {
		277	IFLA_BRIDGE_MRP_START_IN_TEST_UNSPEC,
		278	IFLA_BRIDGE_MRP_START_IN_TEST_IN_ID,
		279	IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL,
		280	IFLA_BRIDGE_MRP_START_IN_TEST_MAX_MISS,
		281	IFLA_BRIDGE_MRP_START_IN_TEST_PERIOD,
		282	__IFLA_BRIDGE_MRP_START_IN_TEST_MAX,
		283	};
		284
		285	#define IFLA_BRIDGE_MRP_START_IN_TEST_MAX (__IFLA_BRIDGE_MRP_START_IN_TEST_MAX - 1)
		286
231	struct br_mrp_instance {	287	struct br_mrp_instance {
232	__u32 ring_id;	288	__u32 ring_id;
233	__u32 p_ifindex;	289	__u32 p_ifindex;
@@ -253,6 +309,25 @@ struct br_mrp_start_test { · 19 unmodified lines
253	__u32 monitor;	309	__u32 monitor;
254	};	310	};
255		311
		312	struct br_mrp_in_state {
		313	__u32 in_state;
		314	__u16 in_id;
		315	};
		316
		317	struct br_mrp_in_role {
		318	__u32 ring_id;
		319	__u32 in_role;
		320	__u32 i_ifindex;
		321	__u16 in_id;
		322	};
		323
		324	struct br_mrp_start_in_test {
		325	__u32 interval;
		326	__u32 max_miss;
		327	__u32 period;
		328	__u16 in_id;
		329	};
		330
256	struct bridge_stp_xstats {	331	struct bridge_stp_xstats {
257	__u64 transition_blk;	332	__u64 transition_blk;
258	__u64 transition_fwd;	333	__u64 transition_fwd;

include/uapi/linux/if_link.h+22−1

 	IFLA_PROP_LIST,
 	IFLA_ALT_IFNAME, /* Alternative ifname */
 	IFLA_PERM_ADDRESS,
+	IFLA_PROTO_DOWN_REASON,
 	__IFLA_MAX
 };
 #define IFLA_MAX (__IFLA_MAX - 1)
+enum {
+	IFLA_PROTO_DOWN_REASON_UNSPEC,
+	IFLA_PROTO_DOWN_REASON_MASK,	/* u32, mask for reason bits */
+	IFLA_PROTO_DOWN_REASON_VALUE,   /* u32, reason bit value */
+	__IFLA_PROTO_DOWN_REASON_CNT,
+	IFLA_PROTO_DOWN_REASON_MAX = __IFLA_PROTO_DOWN_REASON_CNT - 1
+};
 /* backwards compatibility for userspace */
 #ifndef __KERNEL__
 #define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
 	IFLA_BRPORT_ISOLATED,
 	IFLA_BRPORT_BACKUP_PORT,
 	IFLA_BRPORT_MRP_RING_OPEN,
+	IFLA_BRPORT_MRP_IN_OPEN,
 	__IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
 #define IFLA_IPOIB_MAX (__IFLA_IPOIB_MAX - 1)
-/* HSR section */
+/* HSR/PRP section, both uses same interface */
+/* Different redundancy protocols for hsr device */
+enum {
+	HSR_PROTOCOL_HSR,
+	HSR_PROTOCOL_PRP,
+	HSR_PROTOCOL_MAX,
+};
 enum {
 	IFLA_HSR_UNSPEC,
 	IFLA_HSR_SUPERVISION_ADDR,	/* Supervision frame multicast addr */
 	IFLA_HSR_SEQ_NR,
 	IFLA_HSR_VERSION,		/* HSR version */
+	IFLA_HSR_PROTOCOL,		/* Indicate different protocol than
+					 * HSR. For example PRP.
+					 */
 	__IFLA_HSR_MAX,
 };

include/uapi/linux/if_xdp.h+4−1

 };
 struct xdp_statistics {
-	__u64 rx_dropped; /* Dropped for reasons other than invalid desc */
+	__u64 rx_dropped; /* Dropped for other reasons */
 	__u64 rx_invalid_descs; /* Dropped due to invalid descriptor */
 	__u64 tx_invalid_descs; /* Dropped due to invalid descriptor */
+	__u64 rx_ring_full; /* Dropped due to rx ring being full */
+	__u64 rx_fill_ring_empty_descs; /* Failed to retrieve item from fill ring */
+	__u64 tx_ring_empty_descs; /* Failed to retrieve item from tx ring */
 };
 struct xdp_options {

include/uapi/linux/in.h+1−0

@@ -123,6 +123,7 @@ struct in_addr { · 122 unmodified lines
123	#define IP_CHECKSUM 23	123	#define IP_CHECKSUM 23
124	#define IP_BIND_ADDRESS_NO_PORT 24	124	#define IP_BIND_ADDRESS_NO_PORT 24
125	#define IP_RECVFRAGSIZE 25	125	#define IP_RECVFRAGSIZE 25
		126	#define IP_RECVERR_RFC4884 26
126		127
127	/* IP_MTU_DISCOVER values */	128	/* IP_MTU_DISCOVER values */
128	#define IP_PMTUDISC_DONT 0 /* Never send DF frames */	129	#define IP_PMTUDISC_DONT 0 /* Never send DF frames */

include/uapi/linux/in6.h+1−0

@@ -179,6 +179,7 @@ struct in6_flowlabel_req { · 178 unmodified lines
179	#define IPV6_LEAVE_ANYCAST 28	179	#define IPV6_LEAVE_ANYCAST 28
180	#define IPV6_MULTICAST_ALL 29	180	#define IPV6_MULTICAST_ALL 29
181	#define IPV6_ROUTER_ALERT_ISOLATE 30	181	#define IPV6_ROUTER_ALERT_ISOLATE 30
		182	#define IPV6_RECVERR_RFC4884 31
182		183
183	/* IPV6_MTU_DISCOVER values */	184	/* IPV6_MTU_DISCOVER values */
184	#define IPV6_PMTUDISC_DONT 0	185	#define IPV6_PMTUDISC_DONT 0

include/uapi/linux/inet_diag.h+1−0

@@ -65,6 +65,7 @@ enum { · 64 unmodified lines
65	INET_DIAG_REQ_NONE,	65	INET_DIAG_REQ_NONE,
66	INET_DIAG_REQ_BYTECODE,	66	INET_DIAG_REQ_BYTECODE,
67	INET_DIAG_REQ_SK_BPF_STORAGES,	67	INET_DIAG_REQ_SK_BPF_STORAGES,
		68	INET_DIAG_REQ_PROTOCOL,
68	__INET_DIAG_REQ_MAX,	69	__INET_DIAG_REQ_MAX,
69	};	70	};
70		71

include/uapi/linux/mdio.h+26−0

@@ -324,4 +324,30 @@ static inline __u16 mdio_phy_id_c45(int prtad, int devad) · 323 unmodified lines
324	return MDIO_PHY_ID_C45 \| (prtad << 5) \| devad;	324	return MDIO_PHY_ID_C45 \| (prtad << 5) \| devad;
325	}	325	}
326		326
		327	/* UsxgmiiChannelInfo[15:0] for USXGMII in-band auto-negotiation.*/
		328	#define MDIO_USXGMII_EEE_CLK_STP 0x0080 /* EEE clock stop supported */
		329	#define MDIO_USXGMII_EEE 0x0100 /* EEE supported */
		330	#define MDIO_USXGMII_SPD_MASK 0x0e00 /* USXGMII speed mask */
		331	#define MDIO_USXGMII_FULL_DUPLEX 0x1000 /* USXGMII full duplex */
		332	#define MDIO_USXGMII_DPX_SPD_MASK 0x1e00 /* USXGMII duplex and speed bits */
		333	#define MDIO_USXGMII_10 0x0000 /* 10Mbps */
		334	#define MDIO_USXGMII_10HALF 0x0000 /* 10Mbps half-duplex */
		335	#define MDIO_USXGMII_10FULL 0x1000 /* 10Mbps full-duplex */
		336	#define MDIO_USXGMII_100 0x0200 /* 100Mbps */
		337	#define MDIO_USXGMII_100HALF 0x0200 /* 100Mbps half-duplex */
		338	#define MDIO_USXGMII_100FULL 0x1200 /* 100Mbps full-duplex */
		339	#define MDIO_USXGMII_1000 0x0400 /* 1000Mbps */
		340	#define MDIO_USXGMII_1000HALF 0x0400 /* 1000Mbps half-duplex */
		341	#define MDIO_USXGMII_1000FULL 0x1400 /* 1000Mbps full-duplex */
		342	#define MDIO_USXGMII_10G 0x0600 /* 10Gbps */
		343	#define MDIO_USXGMII_10GHALF 0x0600 /* 10Gbps half-duplex */
		344	#define MDIO_USXGMII_10GFULL 0x1600 /* 10Gbps full-duplex */
		345	#define MDIO_USXGMII_2500 0x0800 /* 2500Mbps */
		346	#define MDIO_USXGMII_2500HALF 0x0800 /* 2500Mbps half-duplex */
		347	#define MDIO_USXGMII_2500FULL 0x1800 /* 2500Mbps full-duplex */
		348	#define MDIO_USXGMII_5000 0x0a00 /* 5000Mbps */
		349	#define MDIO_USXGMII_5000HALF 0x0a00 /* 5000Mbps half-duplex */
		350	#define MDIO_USXGMII_5000FULL 0x1a00 /* 5000Mbps full-duplex */
		351	#define MDIO_USXGMII_LINK 0x8000 /* PHY link with copper-side partner */
		352
327	#endif /* _UAPI__LINUX_MDIO_H__ */	353	#endif /* _UAPI__LINUX_MDIO_H__ */

include/uapi/linux/mptcp.h+17−0

@@ -86,4 +86,21 @@ enum { · 85 unmodified lines
86	__MPTCP_PM_CMD_AFTER_LAST	86	__MPTCP_PM_CMD_AFTER_LAST
87	};	87	};
88		88
		89	#define MPTCP_INFO_FLAG_FALLBACK _BITUL(0)
		90	#define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1)
		91
		92	struct mptcp_info {
		93	__u8 mptcpi_subflows;
		94	__u8 mptcpi_add_addr_signal;
		95	__u8 mptcpi_add_addr_accepted;
		96	__u8 mptcpi_subflows_max;
		97	__u8 mptcpi_add_addr_signal_max;
		98	__u8 mptcpi_add_addr_accepted_max;
		99	__u32 mptcpi_flags;
		100	__u32 mptcpi_token;
		101	__u64 mptcpi_write_seq;
		102	__u64 mptcpi_snd_una;
		103	__u64 mptcpi_rcv_nxt;
		104	};
		105
89	#endif /* _UAPI_MPTCP_H */	106	#endif /* _UAPI_MPTCP_H */

include/uapi/linux/mrp_bridge.h+38−0

@@ -21,11 +21,22 @@ enum br_mrp_ring_role_type { · 20 unmodified lines
21	BR_MRP_RING_ROLE_MRA,	21	BR_MRP_RING_ROLE_MRA,
22	};	22	};
23		23
		24	enum br_mrp_in_role_type {
		25	BR_MRP_IN_ROLE_DISABLED,
		26	BR_MRP_IN_ROLE_MIC,
		27	BR_MRP_IN_ROLE_MIM,
		28	};
		29
24	enum br_mrp_ring_state_type {	30	enum br_mrp_ring_state_type {
25	BR_MRP_RING_STATE_OPEN,	31	BR_MRP_RING_STATE_OPEN,
26	BR_MRP_RING_STATE_CLOSED,	32	BR_MRP_RING_STATE_CLOSED,
27	};	33	};
28		34
		35	enum br_mrp_in_state_type {
		36	BR_MRP_IN_STATE_OPEN,
		37	BR_MRP_IN_STATE_CLOSED,
		38	};
		39
29	enum br_mrp_port_state_type {	40	enum br_mrp_port_state_type {
30	BR_MRP_PORT_STATE_DISABLED,	41	BR_MRP_PORT_STATE_DISABLED,
31	BR_MRP_PORT_STATE_BLOCKED,	42	BR_MRP_PORT_STATE_BLOCKED,
@@ -36,6 +47,7 @@ enum br_mrp_port_state_type { · 4 unmodified lines
36	enum br_mrp_port_role_type {	47	enum br_mrp_port_role_type {
37	BR_MRP_PORT_ROLE_PRIMARY,	48	BR_MRP_PORT_ROLE_PRIMARY,
38	BR_MRP_PORT_ROLE_SECONDARY,	49	BR_MRP_PORT_ROLE_SECONDARY,
		50	BR_MRP_PORT_ROLE_INTER,
39	};	51	};
40		52
41	enum br_mrp_tlv_header_type {	53	enum br_mrp_tlv_header_type {
@@ -45,6 +57,10 @@ enum br_mrp_tlv_header_type { · 3 unmodified lines
45	BR_MRP_TLV_HEADER_RING_TOPO = 0x3,	57	BR_MRP_TLV_HEADER_RING_TOPO = 0x3,
46	BR_MRP_TLV_HEADER_RING_LINK_DOWN = 0x4,	58	BR_MRP_TLV_HEADER_RING_LINK_DOWN = 0x4,
47	BR_MRP_TLV_HEADER_RING_LINK_UP = 0x5,	59	BR_MRP_TLV_HEADER_RING_LINK_UP = 0x5,
		60	BR_MRP_TLV_HEADER_IN_TEST = 0x6,
		61	BR_MRP_TLV_HEADER_IN_TOPO = 0x7,
		62	BR_MRP_TLV_HEADER_IN_LINK_DOWN = 0x8,
		63	BR_MRP_TLV_HEADER_IN_LINK_UP = 0x9,
48	BR_MRP_TLV_HEADER_OPTION = 0x7f,	64	BR_MRP_TLV_HEADER_OPTION = 0x7f,
49	};	65	};
50		66
@@ -118,4 +134,26 @@ struct br_mrp_oui_hdr { · 67 unmodified lines
118	__u8 oui[MRP_OUI_LENGTH];	134	__u8 oui[MRP_OUI_LENGTH];
119	};	135	};
120		136
		137	struct br_mrp_in_test_hdr {
		138	__be16 id;
		139	__u8 sa[ETH_ALEN];
		140	__be16 port_role;
		141	__be16 state;
		142	__be16 transitions;
		143	__be32 timestamp;
		144	};
		145
		146	struct br_mrp_in_topo_hdr {
		147	__u8 sa[ETH_ALEN];
		148	__be16 id;
		149	__be16 interval;
		150	};
		151
		152	struct br_mrp_in_link_hdr {
		153	__u8 sa[ETH_ALEN];
		154	__be16 port_role;
		155	__be16 id;
		156	__be16 interval;
		157	};
		158
121	#endif	159	#endif

include/uapi/linux/neighbour.h+24−0

@@ -30,6 +30,7 @@ enum { · 29 unmodified lines
30	NDA_SRC_VNI,	30	NDA_SRC_VNI,
31	NDA_PROTOCOL, /* Originator of entry */	31	NDA_PROTOCOL, /* Originator of entry */
32	NDA_NH_ID,	32	NDA_NH_ID,
		33	NDA_FDB_EXT_ATTRS,
33	__NDA_MAX	34	__NDA_MAX
34	};	35	};
35		36
@@ -172,4 +173,27 @@ enum { · 136 unmodified lines
172	};	173	};
173	#define NDTA_MAX (__NDTA_MAX - 1)	174	#define NDTA_MAX (__NDTA_MAX - 1)
174		175
		176	/* FDB activity notification bits used in NFEA_ACTIVITY_NOTIFY:
		177	* - FDB_NOTIFY_BIT - notify on activity/expire for any entry
		178	* - FDB_NOTIFY_INACTIVE_BIT - mark as inactive to avoid multiple notifications
		179	*/
		180	enum {
		181	FDB_NOTIFY_BIT = (1 << 0),
		182	FDB_NOTIFY_INACTIVE_BIT = (1 << 1)
		183	};
		184
		185	/* embedded into NDA_FDB_EXT_ATTRS:
		186	* [NDA_FDB_EXT_ATTRS] = {
		187	* [NFEA_ACTIVITY_NOTIFY]
		188	* ...
		189	* }
		190	*/
		191	enum {
		192	NFEA_UNSPEC,
		193	NFEA_ACTIVITY_NOTIFY,
		194	NFEA_DONT_REFRESH,
		195	__NFEA_MAX
		196	};
		197	#define NFEA_MAX (__NFEA_MAX - 1)
		198
175	#endif	199	#endif

include/uapi/linux/netfilter/nf_tables.h+14−0

 };
 #define NFTA_TABLE_MAX		(__NFTA_TABLE_MAX - 1)
+enum nft_chain_flags {
+	NFT_CHAIN_BASE		= (1 << 0),
+	NFT_CHAIN_HW_OFFLOAD	= (1 << 1),
+	NFT_CHAIN_BINDING	= (1 << 2),
+};
+#define NFT_CHAIN_FLAGS		(NFT_CHAIN_BASE		| \
+				 NFT_CHAIN_HW_OFFLOAD	| \
+				 NFT_CHAIN_BINDING)
 /**
  * enum nft_chain_attributes - nf_tables chain netlink attributes
  *
  * @NFTA_CHAIN_TYPE: type name of the string (NLA_NUL_STRING)
  * @NFTA_CHAIN_COUNTERS: counter specification of the chain (NLA_NESTED: nft_counter_attributes)
  * @NFTA_CHAIN_FLAGS: chain flags
+ * @NFTA_CHAIN_ID: uniquely identifies a chain in a transaction (NLA_U32)
  */
 enum nft_chain_attributes {
 	NFTA_CHAIN_UNSPEC,
 	NFTA_CHAIN_COUNTERS,
 	NFTA_CHAIN_PAD,
 	NFTA_CHAIN_FLAGS,
+	NFTA_CHAIN_ID,
 	__NFTA_CHAIN_MAX
 };
 #define NFTA_CHAIN_MAX		(__NFTA_CHAIN_MAX - 1)
 	NFTA_RULE_PAD,
 	NFTA_RULE_ID,
 	NFTA_RULE_POSITION_ID,
+	NFTA_RULE_CHAIN_ID,
 	__NFTA_RULE_MAX
 };
 #define NFTA_RULE_MAX		(__NFTA_RULE_MAX - 1)
  *
  * @NFTA_VERDICT_CODE: nf_tables verdict (NLA_U32: enum nft_verdicts)
  * @NFTA_VERDICT_CHAIN: jump target chain name (NLA_STRING)
+ * @NFTA_VERDICT_CHAIN_ID: jump target chain ID (NLA_U32)
  */
 enum nft_verdict_attributes {
 	NFTA_VERDICT_UNSPEC,
 	NFTA_VERDICT_CODE,
 	NFTA_VERDICT_CHAIN,
+	NFTA_VERDICT_CHAIN_ID,
 	__NFTA_VERDICT_MAX
 };
 #define NFTA_VERDICT_MAX	(__NFTA_VERDICT_MAX - 1)

include/uapi/linux/netfilter/xt_connmark.h+1−1

@@ -4,7 +4,7 @@ · 3 unmodified lines
4		4
5	#include <linux/types.h>	5	#include <linux/types.h>
6		6
7	/* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>	7	/* Copyright (C) 2002,2004 MARA Systems AB <https://www.marasystems.com>
8	* by Henrik Nordstrom <hno@marasystems.com>	8	* by Henrik Nordstrom <hno@marasystems.com>
9	*	9	*
10	* This program is free software; you can redistribute it and/or modify	10	* This program is free software; you can redistribute it and/or modify

include/uapi/linux/nl80211.h+72−22

  *
  * By setting @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK flag drivers
  * can indicate they support offloading EAPOL handshakes for WPA/WPA2
- * preshared key authentication. In %NL80211_CMD_CONNECT the preshared
+ * preshared key authentication in station mode. In %NL80211_CMD_CONNECT
- * key should be specified using %NL80211_ATTR_PMK. Drivers supporting
+ * the preshared key should be specified using %NL80211_ATTR_PMK. Drivers
- * this offload may reject the %NL80211_CMD_CONNECT when no preshared
+ * supporting this offload may reject the %NL80211_CMD_CONNECT when no
- * key material is provided, for example when that driver does not
+ * preshared key material is provided, for example when that driver does
- * support setting the temporal keys through %CMD_NEW_KEY.
+ * not support setting the temporal keys through %NL80211_CMD_NEW_KEY.
  *
  * Similarly @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X flag can be
  * set by drivers indicating offload support of the PTK/GTK EAPOL
- * handshakes during 802.1X authentication. In order to use the offload
+ * handshakes during 802.1X authentication in station mode. In order to
- * the %NL80211_CMD_CONNECT should have %NL80211_ATTR_WANT_1X_4WAY_HS
+ * use the offload the %NL80211_CMD_CONNECT should have
- * attribute flag. Drivers supporting this offload may reject the
+ * %NL80211_ATTR_WANT_1X_4WAY_HS attribute flag. Drivers supporting this
- * %NL80211_CMD_CONNECT when the attribute flag is not present.
+ * offload may reject the %NL80211_CMD_CONNECT when the attribute flag is
+ * not present.
+ *
+ * By setting @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK flag drivers
+ * can indicate they support offloading EAPOL handshakes for WPA/WPA2
+ * preshared key authentication in AP mode. In %NL80211_CMD_START_AP
+ * the preshared key should be specified using %NL80211_ATTR_PMK. Drivers
+ * supporting this offload may reject the %NL80211_CMD_START_AP when no
+ * preshared key material is provided, for example when that driver does
+ * not support setting the temporal keys through %NL80211_CMD_NEW_KEY.
  *
  * For 802.1X the PMK or PMK-R0 are set by providing %NL80211_ATTR_PMK
  * using %NL80211_CMD_SET_PMK. For offloaded FT support also
  * @NL80211_CMD_SET_STATION: Set station attributes for station identified by
  *	%NL80211_ATTR_MAC on the interface identified by %NL80211_ATTR_IFINDEX.
  * @NL80211_CMD_NEW_STATION: Add a station with given attributes to the
- *	the interface identified by %NL80211_ATTR_IFINDEX.
+ *	interface identified by %NL80211_ATTR_IFINDEX.
  * @NL80211_CMD_DEL_STATION: Remove a station identified by %NL80211_ATTR_MAC
  *	or, if no MAC address given, all stations, on the interface identified
  *	by %NL80211_ATTR_IFINDEX. %NL80211_ATTR_MGMT_SUBTYPE and
  * @NL80211_CMD_DEL_MPATH: Delete a mesh path to the destination given by
  *	%NL80211_ATTR_MAC.
  * @NL80211_CMD_NEW_PATH: Add a mesh path with given attributes to the
- *	the interface identified by %NL80211_ATTR_IFINDEX.
+ *	interface identified by %NL80211_ATTR_IFINDEX.
  * @NL80211_CMD_DEL_PATH: Remove a mesh path identified by %NL80211_ATTR_MAC
  *	or, if no MAC address given, all mesh paths, on the interface identified
  *	by %NL80211_ATTR_IFINDEX.
  * @NL80211_CMD_SET_COALESCE: Configure coalesce rules or clear existing rules.
  *
  * @NL80211_CMD_CHANNEL_SWITCH: Perform a channel switch by announcing the
- *	the new channel information (Channel Switch Announcement - CSA)
+ *	new channel information (Channel Switch Announcement - CSA)
  *	in the beacon for some time (as defined in the
  *	%NL80211_ATTR_CH_SWITCH_COUNT parameter) and then change to the
  *	new channel. Userspace provides the new channel information (using
  *	randomization may be enabled and configured by specifying the
  *	%NL80211_ATTR_MAC and %NL80211_ATTR_MAC_MASK attributes.
  *	If a timeout is requested, use the %NL80211_ATTR_TIMEOUT attribute.
- *	A u64 cookie for further %NL80211_ATTR_COOKIE use is is returned in
+ *	A u64 cookie for further %NL80211_ATTR_COOKIE use is returned in
  *	the netlink extended ack message.
  *
  *	To cancel a measurement, close the socket that requested it.
  *	rates as defined by IEEE 802.11 7.3.2.2 but without the length
  *	restriction (at most %NL80211_MAX_SUPP_RATES).
  * @NL80211_ATTR_STA_VLAN: interface index of VLAN interface to move station
- *	to, or the AP interface the station was originally added to to.
+ *	to, or the AP interface the station was originally added to.
  * @NL80211_ATTR_STA_INFO: information about a station, part of station info
  *	given for %NL80211_CMD_GET_STATION, nested attribute containing
  *	info as possible, see &enum nl80211_sta_info.
  * @NL80211_ATTR_STA_SUPPORTED_CHANNELS: array of supported channels.
  *
  * @NL80211_ATTR_STA_SUPPORTED_OPER_CLASSES: array of supported
- *      supported operating classes.
+ *      operating classes.
  *
  * @NL80211_ATTR_HANDLE_DFS: A flag indicating whether user space
  *	controls DFS operation in IBSS mode. If the flag is included in
  *
  * @NL80211_ATTR_PMK: attribute for passing PMK key material. Used with
  *	%NL80211_CMD_SET_PMKSA for the PMKSA identified by %NL80211_ATTR_PMKID.
- *	For %NL80211_CMD_CONNECT it is used to provide PSK for offloading 4-way
+ *	For %NL80211_CMD_CONNECT and %NL80211_CMD_START_AP it is used to provide
- *	handshake for WPA/WPA2-PSK networks. For 802.1X authentication it is
+ *	PSK for offloading 4-way handshake for WPA/WPA2-PSK networks. For 802.1X
- *	used with %NL80211_CMD_SET_PMK. For offloaded FT support this attribute
+ *	authentication it is used with %NL80211_CMD_SET_PMK. For offloaded FT
- *	specifies the PMK-R0 if NL80211_ATTR_PMKR0_NAME is included as well.
+ *	support this attribute specifies the PMK-R0 if NL80211_ATTR_PMKR0_NAME
+ *	is included as well.
  *
  * @NL80211_ATTR_SCHED_SCAN_MULTI: flag attribute which user-space shall use to
  *	indicate that it supports multiple active scheduled scan requests.
  *      nl80211_txq_stats)
  * @NL80211_ATTR_TXQ_LIMIT: Total packet limit for the TXQ queues for this phy.
  *      The smaller of this and the memory limit is enforced.
- * @NL80211_ATTR_TXQ_MEMORY_LIMIT: Total memory memory limit (in bytes) for the
+ * @NL80211_ATTR_TXQ_MEMORY_LIMIT: Total memory limit (in bytes) for the
  *      TXQ queues for this phy. The smaller of this and the packet limit is
  *      enforced.
  * @NL80211_ATTR_TXQ_QUANTUM: TXQ scheduler quantum (bytes). Number of bytes
  * @NL80211_STA_INFO_AIRTIME_LINK_METRIC: airtime link metric for mesh station
  * @NL80211_STA_INFO_ASSOC_AT_BOOTTIME: Timestamp (CLOCK_BOOTTIME, nanoseconds)
  *	of STA's association
+ * @NL80211_STA_INFO_CONNECTED_TO_AS: set to true if STA has a path to a
+ *	authentication server (u8, 0 or 1)
  * @__NL80211_STA_INFO_AFTER_LAST: internal
  * @NL80211_STA_INFO_MAX: highest possible station info attribute
  */
 	NL80211_STA_INFO_AIRTIME_WEIGHT,
 	NL80211_STA_INFO_AIRTIME_LINK_METRIC,
 	NL80211_STA_INFO_ASSOC_AT_BOOTTIME,
+	NL80211_STA_INFO_CONNECTED_TO_AS,
 	/* keep last */
 	__NL80211_STA_INFO_AFTER_LAST,
  *	field.  If left unset then the mesh formation field will only
  *	advertise such if there is an active root mesh path.
  *
+ * @NL80211_MESHCONF_NOLEARN: Try to avoid multi-hop path discovery (e.g.
+ *      PREQ/PREP for HWMP) if the destination is a direct neighbor. Note that
+ *      this might not be the optimal decision as a multi-hop route might be
+ *      better. So if using this setting you will likely also want to disable
+ *      dot11MeshForwarding and use another mesh routing protocol on top.
+ *
+ * @NL80211_MESHCONF_CONNECTED_TO_AS: If set to true then this mesh STA
+ *	will advertise that it is connected to a authentication server
+ *	in the mesh formation field.
+ *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
  */
 enum nl80211_meshconf_params {
 	NL80211_MESHCONF_AWAKE_WINDOW,
 	NL80211_MESHCONF_PLINK_TIMEOUT,
 	NL80211_MESHCONF_CONNECTED_TO_GATE,
+	NL80211_MESHCONF_NOLEARN,
+	NL80211_MESHCONF_CONNECTED_TO_AS,
 	/* keep last */
 	__NL80211_MESHCONF_ATTR_AFTER_LAST,
  *	attribute must be provided as well
  * @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel
  * @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel
+ * @NL80211_CHAN_WIDTH_1: 1 MHz OFDM channel
+ * @NL80211_CHAN_WIDTH_2: 2 MHz OFDM channel
+ * @NL80211_CHAN_WIDTH_4: 4 MHz OFDM channel
+ * @NL80211_CHAN_WIDTH_8: 8 MHz OFDM channel
+ * @NL80211_CHAN_WIDTH_16: 16 MHz OFDM channel
  */
 enum nl80211_chan_width {
 	NL80211_CHAN_WIDTH_20_NOHT,
 	NL80211_CHAN_WIDTH_160,
 	NL80211_CHAN_WIDTH_5,
 	NL80211_CHAN_WIDTH_10,
+	NL80211_CHAN_WIDTH_1,
+	NL80211_CHAN_WIDTH_2,
+	NL80211_CHAN_WIDTH_4,
+	NL80211_CHAN_WIDTH_8,
+	NL80211_CHAN_WIDTH_16,
 };
 /**
  * @NL80211_BSS_CHAN_WIDTH_20: control channel is 20 MHz wide or compatible
  * @NL80211_BSS_CHAN_WIDTH_10: control channel is 10 MHz wide
  * @NL80211_BSS_CHAN_WIDTH_5: control channel is 5 MHz wide
+ * @NL80211_BSS_CHAN_WIDTH_1: control channel is 1 MHz wide
+ * @NL80211_BSS_CHAN_WIDTH_2: control channel is 2 MHz wide
  */
 enum nl80211_bss_scan_width {
 	NL80211_BSS_CHAN_WIDTH_20,
 	NL80211_BSS_CHAN_WIDTH_10,
 	NL80211_BSS_CHAN_WIDTH_5,
+	NL80211_BSS_CHAN_WIDTH_1,
+	NL80211_BSS_CHAN_WIDTH_2,
 };
 /**
  * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)
  * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 69.12 GHz)
  * @NL80211_BAND_6GHZ: around 6 GHz band (5.9 - 7.2 GHz)
+ * @NL80211_BAND_S1GHZ: around 900MHz, supported by S1G PHYs
  * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace
  *	since newer kernel versions may support more bands
  */
 	NL80211_BAND_5GHZ,
 	NL80211_BAND_60GHZ,
 	NL80211_BAND_6GHZ,
+	NL80211_BAND_S1GHZ,
 	NUM_NL80211_BANDS,
 };
  * enum nl80211_ext_feature_index - bit index of extended features.
  * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
  * @NL80211_EXT_FEATURE_RRM: This driver supports RRM. When featured, user can
- *	can request to use RRM (see %NL80211_ATTR_USE_RRM) with
+ *	request to use RRM (see %NL80211_ATTR_USE_RRM) with
  *	%NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set
  *	the ASSOC_REQ_USE_RRM flag in the association request even if
  *	NL80211_FEATURE_QUIET is not advertized.
  * @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS: The driver
  *	can report tx status for control port over nl80211 tx operations.
  *
+ * @NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION: Driver supports Operating
+ *	Channel Validation (OCV) when using driver's SME for RSNA handshakes.
+ *
+ * @NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK: Device wants to do 4-way
+ *	handshake with PSK in AP mode (PSK is passed as part of the start AP
+ *	command).
+ *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
  */
 	NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT,
 	NL80211_EXT_FEATURE_SCAN_FREQ_KHZ,
 	NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS,
+	NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION,
+	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK,
 	/* add new features before the definition below */
 	NUM_NL80211_EXT_FEATURES,
 };
 /**
- * enum enum nl80211_protocol_features - nl80211 protocol features
+ * enum nl80211_protocol_features - nl80211 protocol features
  * @NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP: nl80211 supports splitting
  *	wiphy dumps (if requested by the application with the attribute
  *	%NL80211_ATTR_SPLIT_WIPHY_DUMP. Also supported is filtering the

include/uapi/linux/openvswitch.h+2−1

 	OVS_DP_ATTR_MEGAFLOW_STATS,	/* struct ovs_dp_megaflow_stats */
 	OVS_DP_ATTR_USER_FEATURES,	/* OVS_DP_F_*  */
 	OVS_DP_ATTR_PAD,
+	OVS_DP_ATTR_MASKS_CACHE_SIZE,
 	__OVS_DP_ATTR_MAX
 };
 	__u64 n_mask_hit;	 /* Number of masks used for flow lookups. */
 	__u32 n_masks;		 /* Number of masks for the datapath. */
 	__u32 pad0;		 /* Pad for future expension. */
+	__u64 n_cache_hit;       /* Number of cache matches for flow lookups. */
 	__u64 pad1;		 /* Pad for future expension. */
-	__u64 pad2;		 /* Pad for future expension. */
 };
 struct ovs_vport_stats {

include/uapi/linux/pkt_cls.h+3−0

@@ -578,6 +578,9 @@ enum { · 577 unmodified lines
578		578
579	TCA_FLOWER_KEY_MPLS_OPTS,	579	TCA_FLOWER_KEY_MPLS_OPTS,
580		580
		581	TCA_FLOWER_KEY_HASH, /* u32 */
		582	TCA_FLOWER_KEY_HASH_MASK, /* u32 */
		583
581	__TCA_FLOWER_MAX,	584	__TCA_FLOWER_MAX,
582	};	585	};
583		586

include/uapi/linux/pkt_sched.h+2−0

@@ -257,6 +257,8 @@ enum { · 256 unmodified lines
257	TCA_RED_STAB,	257	TCA_RED_STAB,
258	TCA_RED_MAX_P,	258	TCA_RED_MAX_P,
259	TCA_RED_FLAGS, /* bitfield32 */	259	TCA_RED_FLAGS, /* bitfield32 */
		260	TCA_RED_EARLY_DROP_BLOCK, /* u32 */
		261	TCA_RED_MARK_BLOCK, /* u32 */
260	__TCA_RED_MAX,	262	__TCA_RED_MAX,
261	};	263	};
262		264

include/uapi/linux/ptp_clock.h+30−4

@@ -53,12 +53,16 @@ · 52 unmodified lines
53	/*	53	/*
54	* Bits of the ptp_perout_request.flags field:	54	* Bits of the ptp_perout_request.flags field:
55	*/	55	*/
56	#define PTP_PEROUT_ONE_SHOT (1<<0)	56	#define PTP_PEROUT_ONE_SHOT (1<<0)
		57	#define PTP_PEROUT_DUTY_CYCLE (1<<1)
		58	#define PTP_PEROUT_PHASE (1<<2)
57		59
58	/*	60	/*
59	* flag fields valid for the new PTP_PEROUT_REQUEST2 ioctl.	61	* flag fields valid for the new PTP_PEROUT_REQUEST2 ioctl.
60	*/	62	*/
61	#define PTP_PEROUT_VALID_FLAGS (PTP_PEROUT_ONE_SHOT)	63	#define PTP_PEROUT_VALID_FLAGS (PTP_PEROUT_ONE_SHOT \| \
		64	PTP_PEROUT_DUTY_CYCLE \| \
		65	PTP_PEROUT_PHASE)
62		66
63	/*	67	/*
64	* No flags are valid for the original PTP_PEROUT_REQUEST ioctl	68	* No flags are valid for the original PTP_PEROUT_REQUEST ioctl
@@ -101,11 +105,33 @@ struct ptp_extts_request { · 36 unmodified lines
101	};	105	};
102		106
103	struct ptp_perout_request {	107	struct ptp_perout_request {
104	struct ptp_clock_time start; /* Absolute start time. */	108	union {
		109	/*
		110	* Absolute start time.
		111	* Valid only if (flags & PTP_PEROUT_PHASE) is unset.
		112	*/
		113	struct ptp_clock_time start;
		114	/*
		115	* Phase offset. The signal should start toggling at an
		116	* unspecified integer multiple of the period, plus this value.
		117	* The start time should be "as soon as possible".
		118	* Valid only if (flags & PTP_PEROUT_PHASE) is set.
		119	*/
		120	struct ptp_clock_time phase;
		121	};
105	struct ptp_clock_time period; /* Desired period, zero means disable. */	122	struct ptp_clock_time period; /* Desired period, zero means disable. */
106	unsigned int index; /* Which channel to configure. */	123	unsigned int index; /* Which channel to configure. */
107	unsigned int flags;	124	unsigned int flags;
108	unsigned int rsv[4]; /* Reserved for future use. */	125	union {
		126	/*
		127	* The "on" time of the signal.
		128	* Must be lower than the period.
		129	* Valid only if (flags & PTP_PEROUT_DUTY_CYCLE) is set.
		130	*/
		131	struct ptp_clock_time on;
		132	/* Reserved for future use. */
		133	unsigned int rsv[4];
		134	};
109	};	135	};
110		136
111	#define PTP_MAX_SAMPLES 25 /* Maximum allowed offset measurement samples. */	137	#define PTP_MAX_SAMPLES 25 /* Maximum allowed offset measurement samples. */

include/uapi/linux/rtnetlink.h+24−22

@@ -257,12 +257,12 @@ enum { · 256 unmodified lines
257		257
258	/* rtm_protocol */	258	/* rtm_protocol */
259		259
260	#define RTPROT_UNSPEC 0	260	#define RTPROT_UNSPEC 0
261	#define RTPROT_REDIRECT 1 /* Route installed by ICMP redirects;	261	#define RTPROT_REDIRECT 1 /* Route installed by ICMP redirects;
262	not used by current IPv4 */	262	not used by current IPv4 */
263	#define RTPROT_KERNEL 2 /* Route installed by kernel */	263	#define RTPROT_KERNEL 2 /* Route installed by kernel */
264	#define RTPROT_BOOT 3 /* Route installed during boot */	264	#define RTPROT_BOOT 3 /* Route installed during boot */
265	#define RTPROT_STATIC 4 /* Route installed by administrator */	265	#define RTPROT_STATIC 4 /* Route installed by administrator */
266		266
267	/* Values of protocol >= RTPROT_STATIC are not interpreted by kernel;	267	/* Values of protocol >= RTPROT_STATIC are not interpreted by kernel;
268	they are just passed from user and back as is.	268	they are just passed from user and back as is.
@@ -271,22 +271,23 @@ enum { · 2 unmodified lines
271	avoid conflicts.	271	avoid conflicts.
272	*/	272	*/
273		273
274	#define RTPROT_GATED 8 /* Apparently, GateD */	274	#define RTPROT_GATED 8 /* Apparently, GateD */
275	#define RTPROT_RA 9 /* RDISC/ND router advertisements */	275	#define RTPROT_RA 9 /* RDISC/ND router advertisements */
276	#define RTPROT_MRT 10 /* Merit MRT */	276	#define RTPROT_MRT 10 /* Merit MRT */
277	#define RTPROT_ZEBRA 11 /* Zebra */	277	#define RTPROT_ZEBRA 11 /* Zebra */
278	#define RTPROT_BIRD 12 /* BIRD */	278	#define RTPROT_BIRD 12 /* BIRD */
279	#define RTPROT_DNROUTED 13 /* DECnet routing daemon */	279	#define RTPROT_DNROUTED 13 /* DECnet routing daemon */
280	#define RTPROT_XORP 14 /* XORP */	280	#define RTPROT_XORP 14 /* XORP */
281	#define RTPROT_NTK 15 /* Netsukuku */	281	#define RTPROT_NTK 15 /* Netsukuku */
282	#define RTPROT_DHCP 16 /* DHCP client */	282	#define RTPROT_DHCP 16 /* DHCP client */
283	#define RTPROT_MROUTED 17 /* Multicast daemon */	283	#define RTPROT_MROUTED 17 /* Multicast daemon */
284	#define RTPROT_BABEL 42 /* Babel daemon */	284	#define RTPROT_KEEPALIVED 18 /* Keepalived daemon */
285	#define RTPROT_BGP 186 /* BGP Routes */	285	#define RTPROT_BABEL 42 /* Babel daemon */
286	#define RTPROT_ISIS 187 /* ISIS Routes */	286	#define RTPROT_BGP 186 /* BGP Routes */
287	#define RTPROT_OSPF 188 /* OSPF Routes */	287	#define RTPROT_ISIS 187 /* ISIS Routes */
288	#define RTPROT_RIP 189 /* RIP Routes */	288	#define RTPROT_OSPF 188 /* OSPF Routes */
289	#define RTPROT_EIGRP 192 /* EIGRP Routes */	289	#define RTPROT_RIP 189 /* RIP Routes */
		290	#define RTPROT_EIGRP 192 /* EIGRP Routes */
290		291
291	/* rtm_scope	292	/* rtm_scope
292		293
@@ -777,6 +778,7 @@ enum { · 484 unmodified lines
777	#define RTEXT_FILTER_BRVLAN (1 << 1)	778	#define RTEXT_FILTER_BRVLAN (1 << 1)
778	#define RTEXT_FILTER_BRVLAN_COMPRESSED (1 << 2)	779	#define RTEXT_FILTER_BRVLAN_COMPRESSED (1 << 2)
779	#define RTEXT_FILTER_SKIP_STATS (1 << 3)	780	#define RTEXT_FILTER_SKIP_STATS (1 << 3)
		781	#define RTEXT_FILTER_MRP (1 << 4)
780		782
781	/* End of information exported to user level */	783	/* End of information exported to user level */
782		784

include/uapi/linux/seg6_iptunnel.h+0−21

@@ -37,25 +37,4 @@ enum { · 36 unmodified lines
37	SEG6_IPTUN_MODE_L2ENCAP,	37	SEG6_IPTUN_MODE_L2ENCAP,
38	};	38	};
39		39
40	#ifdef __KERNEL__
41
42	static inline size_t seg6_lwt_headroom(struct seg6_iptunnel_encap *tuninfo)
43	{
44	int head = 0;
45
46	switch (tuninfo->mode) {
47	case SEG6_IPTUN_MODE_INLINE:
48	break;
49	case SEG6_IPTUN_MODE_ENCAP:
50	head = sizeof(struct ipv6hdr);
51	break;
52	case SEG6_IPTUN_MODE_L2ENCAP:
53	return 0;
54	}
55
56	return ((tuninfo->srh->hdrlen + 1) << 3) + head;
57	}
58
59	#endif
60
61	#endif	40	#endif

include/uapi/linux/snmp.h+1−0

@@ -287,6 +287,7 @@ enum · 286 unmodified lines
287	LINUX_MIB_TCPFASTOPENPASSIVEALTKEY, /* TCPFastOpenPassiveAltKey */	287	LINUX_MIB_TCPFASTOPENPASSIVEALTKEY, /* TCPFastOpenPassiveAltKey */
288	LINUX_MIB_TCPTIMEOUTREHASH, /* TCPTimeoutRehash */	288	LINUX_MIB_TCPTIMEOUTREHASH, /* TCPTimeoutRehash */
289	LINUX_MIB_TCPDUPLICATEDATAREHASH, /* TCPDuplicateDataRehash */	289	LINUX_MIB_TCPDUPLICATEDATAREHASH, /* TCPDuplicateDataRehash */
		290	LINUX_MIB_TCPDSACKRECVSEGS, /* TCPDSACKRecvSegs */
290	__LINUX_MIB_MAX	291	__LINUX_MIB_MAX
291	};	292	};
292		293

include/uapi/linux/tcp.h+1−0

@@ -313,6 +313,7 @@ enum { · 312 unmodified lines
313	TCP_NLA_SRTT, /* smoothed RTT in usecs */	313	TCP_NLA_SRTT, /* smoothed RTT in usecs */
314	TCP_NLA_TIMEOUT_REHASH, /* Timeout-triggered rehash attempts */	314	TCP_NLA_TIMEOUT_REHASH, /* Timeout-triggered rehash attempts */
315	TCP_NLA_BYTES_NOTSENT, /* Bytes in write queue not yet sent */	315	TCP_NLA_BYTES_NOTSENT, /* Bytes in write queue not yet sent */
		316	TCP_NLA_EDT, /* Earliest departure time (CLOCK_MONOTONIC) */
316	};	317	};
317		318
318	/* for TCP_MD5SIG socket option */	319	/* for TCP_MD5SIG socket option */

include/uapi/linux/wireless.h+1−1

@@ -914,7 +914,7 @@ union iwreq_data { · 913 unmodified lines
914	struct iw_param sens; /* signal level threshold */	914	struct iw_param sens; /* signal level threshold */
915	struct iw_param bitrate; /* default bit rate */	915	struct iw_param bitrate; /* default bit rate */
916	struct iw_param txpower; /* default transmit power */	916	struct iw_param txpower; /* default transmit power */
917	struct iw_param rts; /* RTS threshold threshold */	917	struct iw_param rts; /* RTS threshold */
918	struct iw_param frag; /* Fragmentation threshold */	918	struct iw_param frag; /* Fragmentation threshold */
919	__u32 mode; /* Operation mode */	919	__u32 mode; /* Operation mode */
920	struct iw_param retry; /* Retry limits & lifetime */	920	struct iw_param retry; /* Retry limits & lifetime */

include/uapi/linux/xdp_diag.h+11−0

 #define XDP_SHOW_RING_CFG	(1 << 1)
 #define XDP_SHOW_UMEM		(1 << 2)
 #define XDP_SHOW_MEMINFO	(1 << 3)
+#define XDP_SHOW_STATS		(1 << 4)
 enum {
 	XDP_DIAG_NONE,
 	XDP_DIAG_UMEM_FILL_RING,
 	XDP_DIAG_UMEM_COMPLETION_RING,
 	XDP_DIAG_MEMINFO,
+	XDP_DIAG_STATS,
 	__XDP_DIAG_MAX,
 };
 	__u32	refs;
 };
+struct xdp_diag_stats {
+	__u64	n_rx_dropped;
+	__u64	n_rx_invalid;
+	__u64	n_rx_full;
+	__u64	n_fill_ring_empty;
+	__u64	n_tx_invalid;
+	__u64	n_tx_ring_empty;
+};
 #endif /* _LINUX_XDP_DIAG_H */

include/uapi/linux/xfrm.h+1−0

@@ -387,6 +387,7 @@ struct xfrm_usersa_info { · 386 unmodified lines
387	};	387	};
388		388
389	#define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1	389	#define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1
		390	#define XFRM_SA_XFLAG_OSEQ_MAY_WRAP 2
390		391
391	struct xfrm_usersa_id {	392	struct xfrm_usersa_id {
392	xfrm_address_t daddr;	393	xfrm_address_t daddr;

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -72,8 +72,8 @@ enum batadv_subtype { · 71 unmodified lines
72		72
73	/**	73	/**
74	* enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets	74	* enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets
75	* @BATADV_NOT_BEST_NEXT_HOP: flag is set when ogm packet is forwarded and was	75	* @BATADV_NOT_BEST_NEXT_HOP: flag is set when the ogm packet is forwarded and
76	* previously received from someone else than the best neighbor.	76	* was previously received from someone other than the best neighbor.
77	* @BATADV_PRIMARIES_FIRST_HOP: flag unused.	77	* @BATADV_PRIMARIES_FIRST_HOP: flag unused.
78	* @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a	78	* @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a
79	* one hop neighbor on the interface where it was originally received.	79	* one hop neighbor on the interface where it was originally received.
@@ -195,8 +195,8 @@ struct batadv_bla_claim_dst { · 115 unmodified lines
195	/**	195	/**
196	* struct batadv_ogm_packet - ogm (routing protocol) packet	196	* struct batadv_ogm_packet - ogm (routing protocol) packet
197	* @packet_type: batman-adv packet type, part of the general header	197	* @packet_type: batman-adv packet type, part of the general header
198	* @version: batman-adv protocol version, part of the genereal header	198	* @version: batman-adv protocol version, part of the general header
199	* @ttl: time to live for this packet, part of the genereal header	199	* @ttl: time to live for this packet, part of the general header
200	* @flags: contains routing relevant flags - see enum batadv_iv_flags	200	* @flags: contains routing relevant flags - see enum batadv_iv_flags
201	* @seqno: sequence identification	201	* @seqno: sequence identification
202	* @orig: address of the source node	202	* @orig: address of the source node
@@ -247,7 +247,7 @@ struct batadv_ogm2_packet { · 44 unmodified lines
247	/**	247	/**
248	* struct batadv_elp_packet - elp (neighbor discovery) packet	248	* struct batadv_elp_packet - elp (neighbor discovery) packet
249	* @packet_type: batman-adv packet type, part of the general header	249	* @packet_type: batman-adv packet type, part of the general header
250	* @version: batman-adv protocol version, part of the genereal header	250	* @version: batman-adv protocol version, part of the general header
251	* @orig: originator mac address	251	* @orig: originator mac address
252	* @seqno: sequence number	252	* @seqno: sequence number
253	* @elp_interval: currently used ELP sending interval in ms	253	* @elp_interval: currently used ELP sending interval in ms
@@ -265,15 +265,15 @@ struct batadv_elp_packet { · 11 unmodified lines
265	/**	265	/**
266	* struct batadv_icmp_header - common members among all the ICMP packets	266	* struct batadv_icmp_header - common members among all the ICMP packets
267	* @packet_type: batman-adv packet type, part of the general header	267	* @packet_type: batman-adv packet type, part of the general header
268	* @version: batman-adv protocol version, part of the genereal header	268	* @version: batman-adv protocol version, part of the general header
269	* @ttl: time to live for this packet, part of the genereal header	269	* @ttl: time to live for this packet, part of the general header
270	* @msg_type: ICMP packet type	270	* @msg_type: ICMP packet type
271	* @dst: address of the destination node	271	* @dst: address of the destination node
272	* @orig: address of the source node	272	* @orig: address of the source node
273	* @uid: local ICMP socket identifier	273	* @uid: local ICMP socket identifier
274	* @align: not used - useful for alignment purposes only	274	* @align: not used - useful for alignment purposes only
275	*	275	*
276	* This structure is used for ICMP packets parsing only and it is never sent	276	* This structure is used for ICMP packet parsing only and it is never sent
277	* over the wire. The alignment field at the end is there to ensure that	277	* over the wire. The alignment field at the end is there to ensure that
278	* members are padded the same way as they are in real packets.	278	* members are padded the same way as they are in real packets.
279	*/	279	*/
@@ -291,8 +291,8 @@ struct batadv_icmp_header { · 11 unmodified lines
291	/**	291	/**
292	* struct batadv_icmp_packet - ICMP packet	292	* struct batadv_icmp_packet - ICMP packet
293	* @packet_type: batman-adv packet type, part of the general header	293	* @packet_type: batman-adv packet type, part of the general header
294	* @version: batman-adv protocol version, part of the genereal header	294	* @version: batman-adv protocol version, part of the general header
295	* @ttl: time to live for this packet, part of the genereal header	295	* @ttl: time to live for this packet, part of the general header
296	* @msg_type: ICMP packet type	296	* @msg_type: ICMP packet type
297	* @dst: address of the destination node	297	* @dst: address of the destination node
298	* @orig: address of the source node	298	* @orig: address of the source node
@@ -315,8 +315,8 @@ struct batadv_icmp_packet { · 16 unmodified lines
315	/**	315	/**
316	* struct batadv_icmp_tp_packet - ICMP TP Meter packet	316	* struct batadv_icmp_tp_packet - ICMP TP Meter packet
317	* @packet_type: batman-adv packet type, part of the general header	317	* @packet_type: batman-adv packet type, part of the general header
318	* @version: batman-adv protocol version, part of the genereal header	318	* @version: batman-adv protocol version, part of the general header
319	* @ttl: time to live for this packet, part of the genereal header	319	* @ttl: time to live for this packet, part of the general header
320	* @msg_type: ICMP packet type	320	* @msg_type: ICMP packet type
321	* @dst: address of the destination node	321	* @dst: address of the destination node
322	* @orig: address of the source node	322	* @orig: address of the source node
@@ -358,8 +358,8 @@ enum batadv_icmp_tp_subtype { · 35 unmodified lines
358	/**	358	/**
359	* struct batadv_icmp_packet_rr - ICMP RouteRecord packet	359	* struct batadv_icmp_packet_rr - ICMP RouteRecord packet
360	* @packet_type: batman-adv packet type, part of the general header	360	* @packet_type: batman-adv packet type, part of the general header
361	* @version: batman-adv protocol version, part of the genereal header	361	* @version: batman-adv protocol version, part of the general header
362	* @ttl: time to live for this packet, part of the genereal header	362	* @ttl: time to live for this packet, part of the general header
363	* @msg_type: ICMP packet type	363	* @msg_type: ICMP packet type
364	* @dst: address of the destination node	364	* @dst: address of the destination node
365	* @orig: address of the source node	365	* @orig: address of the source node
@@ -397,8 +397,8 @@ struct batadv_icmp_packet_rr { · 31 unmodified lines
397	/**	397	/**
398	* struct batadv_unicast_packet - unicast packet for network payload	398	* struct batadv_unicast_packet - unicast packet for network payload
399	* @packet_type: batman-adv packet type, part of the general header	399	* @packet_type: batman-adv packet type, part of the general header
400	* @version: batman-adv protocol version, part of the genereal header	400	* @version: batman-adv protocol version, part of the general header
401	* @ttl: time to live for this packet, part of the genereal header	401	* @ttl: time to live for this packet, part of the general header
402	* @ttvn: translation table version number	402	* @ttvn: translation table version number
403	* @dest: originator destination of the unicast packet	403	* @dest: originator destination of the unicast packet
404	*/	404	*/
@@ -433,8 +433,8 @@ struct batadv_unicast_4addr_packet { · 28 unmodified lines
433	/**	433	/**
434	* struct batadv_frag_packet - fragmented packet	434	* struct batadv_frag_packet - fragmented packet
435	* @packet_type: batman-adv packet type, part of the general header	435	* @packet_type: batman-adv packet type, part of the general header
436	* @version: batman-adv protocol version, part of the genereal header	436	* @version: batman-adv protocol version, part of the general header
437	* @ttl: time to live for this packet, part of the genereal header	437	* @ttl: time to live for this packet, part of the general header
438	* @dest: final destination used when routing fragments	438	* @dest: final destination used when routing fragments
439	* @orig: originator of the fragment used when merging the packet	439	* @orig: originator of the fragment used when merging the packet
440	* @no: fragment number within this sequence	440	* @no: fragment number within this sequence
@@ -467,8 +467,8 @@ struct batadv_frag_packet { · 26 unmodified lines
467	/**	467	/**
468	* struct batadv_bcast_packet - broadcast packet for network payload	468	* struct batadv_bcast_packet - broadcast packet for network payload
469	* @packet_type: batman-adv packet type, part of the general header	469	* @packet_type: batman-adv packet type, part of the general header
470	* @version: batman-adv protocol version, part of the genereal header	470	* @version: batman-adv protocol version, part of the general header
471	* @ttl: time to live for this packet, part of the genereal header	471	* @ttl: time to live for this packet, part of the general header
472	* @reserved: reserved byte for alignment	472	* @reserved: reserved byte for alignment
473	* @seqno: sequence identification	473	* @seqno: sequence identification
474	* @orig: originator of the broadcast packet	474	* @orig: originator of the broadcast packet
@@ -488,10 +488,10 @@ struct batadv_bcast_packet { · 13 unmodified lines
488	/**	488	/**
489	* struct batadv_coded_packet - network coded packet	489	* struct batadv_coded_packet - network coded packet
490	* @packet_type: batman-adv packet type, part of the general header	490	* @packet_type: batman-adv packet type, part of the general header
491	* @version: batman-adv protocol version, part of the genereal header	491	* @version: batman-adv protocol version, part of the general header
492	* @ttl: time to live for this packet, part of the genereal header	492	* @ttl: time to live for this packet, part of the general header
493	* @first_source: original source of first included packet	493	* @first_source: original source of first included packet
494	* @first_orig_dest: original destinal of first included packet	494	* @first_orig_dest: original destination of first included packet
495	* @first_crc: checksum of first included packet	495	* @first_crc: checksum of first included packet
496	* @first_ttvn: tt-version number of first included packet	496	* @first_ttvn: tt-version number of first included packet
497	* @second_ttl: ttl of second packet	497	* @second_ttl: ttl of second packet
@@ -523,8 +523,8 @@ struct batadv_coded_packet { · 25 unmodified lines
523	/**	523	/**
524	* struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload	524	* struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload
525	* @packet_type: batman-adv packet type, part of the general header	525	* @packet_type: batman-adv packet type, part of the general header
526	* @version: batman-adv protocol version, part of the genereal header	526	* @version: batman-adv protocol version, part of the general header
527	* @ttl: time to live for this packet, part of the genereal header	527	* @ttl: time to live for this packet, part of the general header
528	* @reserved: reserved field (for packet alignment)	528	* @reserved: reserved field (for packet alignment)
529	* @src: address of the source	529	* @src: address of the source
530	* @dst: address of the destination	530	* @dst: address of the destination