diff options
| author | Jiri Kosina <[email protected]> | 2020-04-01 12:26:12 +0200 | 
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2020-04-01 12:26:12 +0200 | 
| commit | c9f289701540baeef9ac7c9977d67a7259f404db (patch) | |
| tree | ac3c29d41da02ac735c9a12da78905842fbccd2f /include/uapi/linux/rtnetlink.h | |
| parent | 0aac6f9aaae5fba08963651d2ce49930145e118f (diff) | |
| parent | 910a7e89cec65efad254c947ce2bf8bf5b370962 (diff) | |
Merge branch 'for-5.7/appleir' into for-linus
- small code cleanups in hid-appleir from Lucas Tanure
Diffstat (limited to 'include/uapi/linux/rtnetlink.h')
| -rw-r--r-- | include/uapi/linux/rtnetlink.h | 11 | 
1 files changed, 11 insertions, 0 deletions
| diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index 1418a8362bb7..4a8c5b745157 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -171,6 +171,13 @@ enum {  	RTM_GETLINKPROP,  #define RTM_GETLINKPROP	RTM_GETLINKPROP +	RTM_NEWVLAN = 112, +#define RTM_NEWNVLAN	RTM_NEWVLAN +	RTM_DELVLAN, +#define RTM_DELVLAN	RTM_DELVLAN +	RTM_GETVLAN, +#define RTM_GETVLAN	RTM_GETVLAN +  	__RTM_MAX,  #define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)  }; @@ -309,6 +316,8 @@ enum rt_scope_t {  #define RTM_F_PREFIX		0x800	/* Prefix addresses		*/  #define RTM_F_LOOKUP_TABLE	0x1000	/* set rtm_table to FIB lookup result */  #define RTM_F_FIB_MATCH	        0x2000	/* return full fib lookup match */ +#define RTM_F_OFFLOAD		0x4000	/* route is offloaded */ +#define RTM_F_TRAP		0x8000	/* route is trapping packets */  /* Reserved table identifiers */ @@ -721,6 +730,8 @@ enum rtnetlink_groups {  #define RTNLGRP_IPV6_MROUTE_R	RTNLGRP_IPV6_MROUTE_R  	RTNLGRP_NEXTHOP,  #define RTNLGRP_NEXTHOP		RTNLGRP_NEXTHOP +	RTNLGRP_BRVLAN, +#define RTNLGRP_BRVLAN		RTNLGRP_BRVLAN  	__RTNLGRP_MAX  };  #define RTNLGRP_MAX	(__RTNLGRP_MAX - 1) |