diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2020-07-15 16:59:12 +0200 |
|---|---|---|
| committer | Anuradha Karuppiah <anuradhak@nvidia.com> | 2020-12-11 21:13:36 +0100 |
| commit | 4bcdb6086c0af476f703e510bfcd4da69ac6c7f9 (patch) | |
| tree | 9eb3edd63c5dce1a680e4cec9f6327998232a3c6 /include | |
| parent | Merge pull request #7711 from volta-networks/fix_ldpsync_client_close_callback (diff) | |
| download | frr-4bcdb6086c0af476f703e510bfcd4da69ac6c7f9.tar.xz frr-4bcdb6086c0af476f703e510bfcd4da69ac6c7f9.zip | |
zebra: move from NDA_NOTIFY to NDA_FDB_EXT_ATTRS
Use the new nested NDA_FDB_EXT_ATTRS attribute to control per-fdb
notifications.
PS: The attributes where updated as a part of the kernel upstreaming
hence the change.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_bridge.h | 11 | ||||
| -rw-r--r-- | include/linux/neighbour.h | 25 |
2 files changed, 24 insertions, 12 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 50011d55e..fb79481cb 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -293,15 +293,4 @@ struct br_mcast_stats { __u64 mcast_bytes[BR_MCAST_DIR_SIZE]; __u64 mcast_packets[BR_MCAST_DIR_SIZE]; }; - -/* FDB notification bits for NDA_NOTIFY: - * - BR_FDB_NFY_STATIC - notify on activity/expire even for a static entry - * - BR_FDB_NFY_INACTIVE - mark as inactive to avoid double notification, - * used with BR_FDB_NFY_STATIC (kernel controlled) - */ -enum { - BR_FDB_NFY_STATIC, - BR_FDB_NFY_INACTIVE, - BR_FDB_NFY_MAX -}; #endif /* _UAPI_LINUX_IF_BRIDGE_H */ diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h index c06fe708f..581af73c7 100644 --- a/include/linux/neighbour.h +++ b/include/linux/neighbour.h @@ -30,7 +30,7 @@ enum { NDA_SRC_VNI, NDA_PROTOCOL, /* Originator of entry */ NDA_NH_ID, - NDA_NOTIFY, + NDA_FDB_EXT_ATTRS, NDA_EXT_FLAGS, __NDA_MAX }; @@ -178,4 +178,27 @@ enum { }; #define NDTA_MAX (__NDTA_MAX - 1) +/* FDB activity notification bits used in NFEA_ACTIVITY_NOTIFY: + * - FDB_NOTIFY_BIT - notify on activity/expire for any entry + * - FDB_NOTIFY_INACTIVE_BIT - mark as inactive to avoid multiple notifications + */ +enum { + FDB_NOTIFY_BIT = (1 << 0), + FDB_NOTIFY_INACTIVE_BIT = (1 << 1) +}; + +/* embedded into NDA_FDB_EXT_ATTRS: + * [NDA_FDB_EXT_ATTRS] = { + * [NFEA_ACTIVITY_NOTIFY] + * ... + * } + */ +enum { + NFEA_UNSPEC, + NFEA_ACTIVITY_NOTIFY, + NFEA_DONT_REFRESH, + __NFEA_MAX +}; +#define NFEA_MAX (__NFEA_MAX - 1) + #endif |