summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-10 11:32:14 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-10 11:32:14 -0500
commitb4c4ebcf3ca22bf9b04fa9c6ccfbfdfe0a256d07 (patch)
tree3ecaed1a3b73f1b8f20dca868b5d3c923c3d2435 /include/net
parenta507c346b7fdc97296fa74626df49fdb7296a04e (diff)
parent599cf8f95f221aa03ac5a6e5e3ee4bc97a6eade5 (diff)
downloadlinux-b4c4ebcf3ca22bf9b04fa9c6ccfbfdfe0a256d07.tar.gz
linux-b4c4ebcf3ca22bf9b04fa9c6ccfbfdfe0a256d07.tar.bz2
linux-b4c4ebcf3ca22bf9b04fa9c6ccfbfdfe0a256d07.zip
Merge branch 'mlxsw-identical-routes-handling'
Jiri Pirko says: ==================== mlxsw: Identical routes handling Ido says: The kernel can store several FIB aliases that share the same prefix and length. These aliases can differ in other parameters such as TOS and metric, which are taken into account during lookup. Offloading devices might not have the same flexibility, allowing only a single route with the same prefix and length to be reflected. mlxsw is one such device. This patchset aims to correctly handle this situation in the mlxsw driver. The first four patches introduce small changes in the IPv4 FIB code, so that listeners of the FIB notification chain will be able to correctly handle identical routes. The last three patches build on top of previous work and introduce the necessary changes in the mlxsw driver. The biggest change is the introduction of a FIB node, where identical routes are chained, instead of a primitive reference counting. This is explained in detail in the fifth patch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip_fib.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 45a184eaff2b..368bb4024b78 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -211,7 +211,6 @@ struct fib_entry_notifier_info {
u8 tos;
u8 type;
u32 tb_id;
- u32 nlflags;
};
struct fib_nh_notifier_info {
@@ -220,6 +219,8 @@ struct fib_nh_notifier_info {
};
enum fib_event_type {
+ FIB_EVENT_ENTRY_REPLACE,
+ FIB_EVENT_ENTRY_APPEND,
FIB_EVENT_ENTRY_ADD,
FIB_EVENT_ENTRY_DEL,
FIB_EVENT_RULE_ADD,