[PATCH 1/2] macsec: Backward compatibility bugfix of consts values

From: Era Mayflower
Date: Thu Mar 05 2020 - 12:55:57 EST


Fixed a compatibility bug, the value of the following consts changes:
* IFLA_MACSEC_PAD (include/uapi/linux/if_link.h)
* MACSEC_SECY_ATTR_PAD (include/uapi/linux/if_macsec.h)
* MACSEC_RXSC_ATTR_PAD (include/uapi/linux/if_macsec.h)

Depends on: macsec: Netlink support of XPN cipher suites (IEEE 802.1AEbw)

Signed-off-by: Era Mayflower <mayflowerera@xxxxxxxxx>
---
include/uapi/linux/if_link.h | 2 +-
include/uapi/linux/if_macsec.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index ee424d915..383316421 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -462,9 +462,9 @@ enum {
IFLA_MACSEC_SCB,
IFLA_MACSEC_REPLAY_PROTECT,
IFLA_MACSEC_VALIDATION,
+ IFLA_MACSEC_PAD,
IFLA_MACSEC_SSCI,
IFLA_MACSEC_SALT,
- IFLA_MACSEC_PAD,
__IFLA_MACSEC_MAX,
};

diff --git a/include/uapi/linux/if_macsec.h b/include/uapi/linux/if_macsec.h
index c8fab9673..a1132107d 100644
--- a/include/uapi/linux/if_macsec.h
+++ b/include/uapi/linux/if_macsec.h
@@ -68,9 +68,9 @@ enum macsec_secy_attrs {
MACSEC_SECY_ATTR_INC_SCI,
MACSEC_SECY_ATTR_ES,
MACSEC_SECY_ATTR_SCB,
+ MACSEC_SECY_ATTR_PAD,
MACSEC_SECY_ATTR_SSCI,
MACSEC_SECY_ATTR_SALT,
- MACSEC_SECY_ATTR_PAD,
__MACSEC_SECY_ATTR_END,
NUM_MACSEC_SECY_ATTR = __MACSEC_SECY_ATTR_END,
MACSEC_SECY_ATTR_MAX = __MACSEC_SECY_ATTR_END - 1,
@@ -82,8 +82,8 @@ enum macsec_rxsc_attrs {
MACSEC_RXSC_ATTR_ACTIVE, /* config/dump, u8 0..1 */
MACSEC_RXSC_ATTR_SA_LIST, /* dump, nested */
MACSEC_RXSC_ATTR_STATS, /* dump, nested, macsec_rxsc_stats_attr */
- MACSEC_RXSC_ATTR_SSCI, /* config/dump, u32 */
MACSEC_RXSC_ATTR_PAD,
+ MACSEC_RXSC_ATTR_SSCI, /* config/dump, u32 */
__MACSEC_RXSC_ATTR_END,
NUM_MACSEC_RXSC_ATTR = __MACSEC_RXSC_ATTR_END,
MACSEC_RXSC_ATTR_MAX = __MACSEC_RXSC_ATTR_END - 1,
--
2.20.1