diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2023-05-08 00:46:05 +0200 |
|---|---|---|
| committer | Michal Kubecek <mkubecek@suse.cz> | 2023-05-08 00:46:05 +0200 |
| commit | 946d18be1fce43da467bf2ee54dbb8012d3b1a32 (patch) | |
| tree | d10c1256762071f26d96a178e107abaa33e45b77 | |
| parent | c4df5b71a0bac2f415c82f92c2b350f4ca603a5e (diff) | |
| download | ethtool-946d18be1fce43da467bf2ee54dbb8012d3b1a32.tar.gz | |
update UAPI header copies
Update to kernel v6.4-rc1.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
| -rw-r--r-- | uapi/linux/const.h | 2 | ||||
| -rw-r--r-- | uapi/linux/if_link.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/uapi/linux/const.h b/uapi/linux/const.h index 5e48987..1eb84b5 100644 --- a/uapi/linux/const.h +++ b/uapi/linux/const.h @@ -28,7 +28,7 @@ #define _BITUL(x) (_UL(1) << (x)) #define _BITULL(x) (_ULL(1) << (x)) -#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1) #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) diff --git a/uapi/linux/if_link.h b/uapi/linux/if_link.h index d61bd32..94fb7ef 100644 --- a/uapi/linux/if_link.h +++ b/uapi/linux/if_link.h @@ -567,6 +567,7 @@ enum { IFLA_BRPORT_MAB, IFLA_BRPORT_MCAST_N_GROUPS, IFLA_BRPORT_MCAST_MAX_GROUPS, + IFLA_BRPORT_NEIGH_VLAN_SUPPRESS, __IFLA_BRPORT_MAX }; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) @@ -633,6 +634,7 @@ enum { IFLA_MACVLAN_MACADDR_COUNT, IFLA_MACVLAN_BC_QUEUE_LEN, IFLA_MACVLAN_BC_QUEUE_LEN_USED, + IFLA_MACVLAN_BC_CUTOFF, __IFLA_MACVLAN_MAX, }; |