Merge branch 'mlxsw-ipv4-unicast-routing'

Jiri Pirko says:

====================
mlxsw: Implement IPV4 unicast routing

This patchset enables IPv4 unicast routing in the Mellanox Spectrum ASIC
switch driver. This builds upon the work that was done by a couple of
previous patchsets.

Patches 1,2,6 add a couple of dependencies outside the driver. Namely, the
ability to propagate ndo_neigh_construct()/destroy() through stacked devices and
a notification whenever DELAY_PROBE_TIME changes. When propagated down, the
ndos allow drivers to add and remove neighbour entries from their private
neighbour table. The DELAY_PROBE_TIME notification gives drivers the ability to
correctly configure their polling interval for neighbour activity, so that
active neighbour won't be marked as STALE.

Patches 3-5,7-8 add the neighbour offloading infrastructure, where patch 7 uses
the DELAY_PROBE_TIME notification in order to correctly configure the device's
polling interval. Patch 8 finally programs neighbours to the device's table
based on NEIGH_UPDATE notifications, so that directly connected routes can
be used.

Patches 9-16 build upon the previous patches and extend the router with
remote routes (nexthop) support.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 9 insertions, 2 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 0c6ee2c5099f..49736a31acaa 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1209,8 +1209,10 @@ struct net_device_ops {
                                                     netdev_features_t features);
         int                     (*ndo_set_features)(struct net_device *dev,
                                                     netdev_features_t features);
-        int                     (*ndo_neigh_construct)(struct neighbour *n);
-        void                    (*ndo_neigh_destroy)(struct neighbour *n);
+        int                     (*ndo_neigh_construct)(struct net_device *dev,
+                                                       struct neighbour *n);
+        void                    (*ndo_neigh_destroy)(struct net_device *dev,
+                                                     struct neighbour *n);
 
         int                     (*ndo_fdb_add)(struct ndmsg *ndm,
                                                struct nlattr *tb[],
@@ -3843,6 +3845,10 @@ void *netdev_lower_dev_get_private(struct net_device *dev,
                                    struct net_device *lower_dev);
 void netdev_lower_state_changed(struct net_device *lower_dev,
                                 void *lower_state_info);
+int netdev_default_l2upper_neigh_construct(struct net_device *dev,
+                                           struct neighbour *n);
+void netdev_default_l2upper_neigh_destroy(struct net_device *dev,
+                                          struct neighbour *n);
 
 /* RSS keys are 40 or 52 bytes long */
 #define NETDEV_RSS_KEY_LEN 52
diff --git a/include/net/netevent.h b/include/net/netevent.h
index d8bbb38584b6..f440df172b56 100644
--- a/include/net/netevent.h
+++ b/include/net/netevent.h
@@ -24,6 +24,7 @@ struct netevent_redirect {
 enum netevent_notif_type {
         NETEVENT_NEIGH_UPDATE = 1, /* arg is struct neighbour ptr */
         NETEVENT_REDIRECT,         /* arg is struct netevent_redirect ptr */
+        NETEVENT_DELAY_PROBE_TIME_UPDATE, /* arg is struct neigh_parms ptr */
 };
 
 int register_netevent_notifier(struct notifier_block *nb);