]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Update kernel headers
authorDavid Ahern <dsahern@kernel.org>
Mon, 21 Feb 2022 16:26:21 +0000 (09:26 -0700)
committerDavid Ahern <dsahern@kernel.org>
Mon, 21 Feb 2022 16:26:21 +0000 (09:26 -0700)
Update kernel headers to commit:
    7b779cc8846a ("Merge branch 'octeontx2-ptp-updates'")

Signed-off-by: David Ahern <dsahern@kernel.org>
include/uapi/linux/if_addr.h
include/uapi/linux/if_link.h

index c4dd87f9b44a17d771e47be1c9808111c387303f..d6db3ff7fa1055ce632fcf39bc543f39ecf354e5 100644 (file)
@@ -33,8 +33,9 @@ enum {
        IFA_CACHEINFO,
        IFA_MULTICAST,
        IFA_FLAGS,
-       IFA_RT_PRIORITY,  /* u32, priority/metric for prefix route */
+       IFA_RT_PRIORITY,        /* u32, priority/metric for prefix route */
        IFA_TARGET_NETNSID,
+       IFA_PROTO,              /* u8, address protocol */
        __IFA_MAX,
 };
 
@@ -67,4 +68,10 @@ struct ifa_cacheinfo {
 #define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
 #define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
 
+/* ifa_proto */
+#define IFAPROT_UNSPEC         0
+#define IFAPROT_KERNEL_LO      1       /* loopback */
+#define IFAPROT_KERNEL_RA      2       /* set by kernel from router announcement */
+#define IFAPROT_KERNEL_LL      3       /* link-local set by kernel */
+
 #endif
index 41708e26a3c90fd1196b497ada405aaaae85b9db..85097a62c3c57cc3ae12367c6d68499cce56df01 100644 (file)
@@ -858,6 +858,7 @@ enum {
        IFLA_BOND_PEER_NOTIF_DELAY,
        IFLA_BOND_AD_LACP_ACTIVE,
        IFLA_BOND_MISSED_MAX,
+       IFLA_BOND_NS_IP6_TARGET,
        __IFLA_BOND_MAX,
 };