diff options
author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2016-04-18 19:19:48 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-21 19:35:44 (GMT) |
commit | 681e683ff30ada19f73c17c38a528528dd8824f1 (patch) | |
tree | dfb1140e166ecf89f994f667e0cb9e73969845e8 /include | |
parent | b7aade15485a660cbf5161962c284131324a9534 (diff) | |
download | linux-681e683ff30ada19f73c17c38a528528dd8824f1.tar.xz |
geneve: break dependency with netdev drivers
Equivalent to "vxlan: break dependency with netdev drivers", don't
autoload geneve module in case the driver is loaded. Instead make the
coupling weaker by using netdevice notifiers as proxy.
Cc: Jesse Gross <jesse@kernel.org>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/netdevice.h | 1 | ||||
-rw-r--r-- | include/net/geneve.h | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d4c8cd4..1f6d5db 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2245,6 +2245,7 @@ struct netdev_lag_lower_state_info { #define NETDEV_PRECHANGEUPPER 0x001A #define NETDEV_CHANGELOWERSTATE 0x001B #define NETDEV_OFFLOAD_PUSH_VXLAN 0x001C +#define NETDEV_OFFLOAD_PUSH_GENEVE 0x001D int register_netdevice_notifier(struct notifier_block *nb); int unregister_netdevice_notifier(struct notifier_block *nb); diff --git a/include/net/geneve.h b/include/net/geneve.h index e6c23dc..cb544a5 100644 --- a/include/net/geneve.h +++ b/include/net/geneve.h @@ -62,13 +62,11 @@ struct genevehdr { struct geneve_opt options[]; }; -#if IS_ENABLED(CONFIG_GENEVE) -void geneve_get_rx_port(struct net_device *netdev); -#else static inline void geneve_get_rx_port(struct net_device *netdev) { + ASSERT_RTNL(); + call_netdevice_notifiers(NETDEV_OFFLOAD_PUSH_GENEVE, netdev); } -#endif #ifdef CONFIG_INET struct net_device *geneve_dev_create_fb(struct net *net, const char *name, |