diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2023-08-09 13:21:20 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2023-08-09 13:21:20 -0700 |
| commit | 6e43b962bf68631b3f1798d7d614ba867f21aadd (patch) | |
| tree | cf4e25a18e745755e7279cb3af8298ab4a6105c1 /include | |
| parent | 64e8c4b6744e1c91b5e36aa9485645968258b60c (diff) | |
| download | iproute2-6e43b962bf68631b3f1798d7d614ba867f21aadd.tar.gz | |
uapi: update headers
Based off ov 6.5-rc5
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/if_packet.h | 6 | ||||
| -rw-r--r-- | include/uapi/linux/pkt_cls.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h index 9efc42382..4d0ad22f8 100644 --- a/include/uapi/linux/if_packet.h +++ b/include/uapi/linux/if_packet.h @@ -18,7 +18,11 @@ struct sockaddr_ll { unsigned short sll_hatype; unsigned char sll_pkttype; unsigned char sll_halen; - unsigned char sll_addr[8]; + union { + unsigned char sll_addr[8]; + /* Actual length is in sll_halen. */ + __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); + }; }; /* Packet types */ diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index 7865f5a98..4f3932bb7 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -710,9 +710,11 @@ enum { TCA_FLOWER_KEY_CFM_OPT_UNSPEC, TCA_FLOWER_KEY_CFM_MD_LEVEL, TCA_FLOWER_KEY_CFM_OPCODE, - TCA_FLOWER_KEY_CFM_OPT_MAX, + __TCA_FLOWER_KEY_CFM_OPT_MAX, }; +#define TCA_FLOWER_KEY_CFM_OPT_MAX (__TCA_FLOWER_KEY_CFM_OPT_MAX - 1) + #define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0) /* Range-based match */ /* Match-all classifier */ |