matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

include: update interface UAPI from 4.15-rc1 

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2018-02-05 17:21:01 -08:00
parent a0fc63ed68
commit 25226777b8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/uapi/linux/if_link.h
View File

@ -161,6 +161,9 @@ enum {
IFLA_EVENT, IFLA_EVENT,
IFLA_NEW_NETNSID, IFLA_NEW_NETNSID,
IFLA_IF_NETNSID, IFLA_IF_NETNSID,
IFLA_CARRIER_UP_COUNT,
IFLA_CARRIER_DOWN_COUNT,
IFLA_NEW_IFINDEX,
__IFLA_MAX __IFLA_MAX
}; };

6
include/uapi/linux/if_macsec.h
View File

@ -18,7 +18,7 @@
#define MACSEC_GENL_NAME "macsec" #define MACSEC_GENL_NAME "macsec"
#define MACSEC_GENL_VERSION 1 #define MACSEC_GENL_VERSION 1
#define MACSEC_MAX_KEY_LEN 256 #define MACSEC_MAX_KEY_LEN 128
#define MACSEC_KEYID_LEN 16 #define MACSEC_KEYID_LEN 16
@ -26,9 +26,9 @@
#define MACSEC_CIPHER_ID_GCM_AES_128 0x0080C20001000001ULL #define MACSEC_CIPHER_ID_GCM_AES_128 0x0080C20001000001ULL
#define MACSEC_CIPHER_ID_GCM_AES_256 0x0080C20001000002ULL #define MACSEC_CIPHER_ID_GCM_AES_256 0x0080C20001000002ULL
#define MACSEC_DEFAULT_CIPHER_ID MACSEC_CIPHER_ID_GCM_AES_128
/* deprecated cipher ID for GCM-AES-128 */ /* deprecated cipher ID for GCM-AES-128 */
#define MACSEC_DEFAULT_CIPHER_ALT 0x0080020001000001ULL #define MACSEC_DEFAULT_CIPHER_ID 0x0080020001000001ULL
#define MACSEC_DEFAULT_CIPHER_ALT MACSEC_CIPHER_ID_GCM_AES_128
#define MACSEC_MIN_ICV_LEN 8 #define MACSEC_MIN_ICV_LEN 8
#define MACSEC_MAX_ICV_LEN 32 #define MACSEC_MAX_ICV_LEN 32