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

[sfrench/cifs-2.6.git] / tools / include / uapi / linux / if_link.h

diff --git a/tools/include/uapi/linux/if_link.h b/tools/include/uapi/linux/if_link.h
index 8aec8769d9442d3eadbeb441cb987d35897c4882..024af2d1d0af4059cba0c40211b1095ecd55387e 100644 (file)
--- a/tools/include/uapi/linux/if_link.h
+++ b/tools/include/uapi/linux/if_link.h
@@ -169,6 +169,7 @@ enum {
        IFLA_MAX_MTU,
        IFLA_PROP_LIST,
        IFLA_ALT_IFNAME, /* Alternative ifname */
+       IFLA_PERM_ADDRESS,
        __IFLA_MAX
 };
 
@@ -485,6 +486,13 @@ enum macsec_validation_type {
        MACSEC_VALIDATE_MAX = __MACSEC_VALIDATE_END - 1,
 };
 
+enum macsec_offload {
+       MACSEC_OFFLOAD_OFF = 0,
+       MACSEC_OFFLOAD_PHY = 1,
+       __MACSEC_OFFLOAD_END,
+       MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,
+};
+
 /* IPVLAN section */
 enum {
        IFLA_IPVLAN_UNSPEC,