diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-16 02:31:44 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-16 02:31:44 +0300 |
| commit | 897dccb8db0d01209c44439ba59d86d3ccbd55ef (patch) | |
| tree | d2e066dcfbc111327cdf167152aec2b392c0d181 /include | |
| parent | e859536dac30aa891a01462eef6e12168c6e8f29 (diff) | |
| parent | 7a5e9d84f9e436035f44310511efdddb6e497996 (diff) | |
| download | linux-897dccb8db0d01209c44439ba59d86d3ccbd55ef.tar.xz | |
Merge branch 'nexthop-Small-changes'
Ido Schimmel says:
====================
nexthop: Small changes
This patch set contains a few small changes that I split out of the RFC
I sent last week [1]. Main change is the conversion of the nexthop
notification chain to a blocking chain so that it could be reused by
device drivers for nexthop objects programming in the future.
Tested with fib_nexthops.sh:
Tests passed: 164
Tests failed: 0
[1] https://lore.kernel.org/netdev/20200908091037.2709823-1-idosch@idosch.org/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netns/nexthop.h | 2 | ||||
| -rw-r--r-- | include/net/nexthop.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/net/netns/nexthop.h b/include/net/netns/nexthop.h index 1937476c94a0..1849e77eb68a 100644 --- a/include/net/netns/nexthop.h +++ b/include/net/netns/nexthop.h @@ -14,6 +14,6 @@ struct netns_nexthop { unsigned int seq; /* protected by rtnl_mutex */ u32 last_id_allocated; - struct atomic_notifier_head notifier_chain; + struct blocking_notifier_head notifier_chain; }; #endif diff --git a/include/net/nexthop.h b/include/net/nexthop.h index 3a4f9e3b91a5..2fd76a9b6dc8 100644 --- a/include/net/nexthop.h +++ b/include/net/nexthop.h @@ -105,13 +105,9 @@ struct nexthop { }; enum nexthop_event_type { - NEXTHOP_EVENT_ADD, NEXTHOP_EVENT_DEL }; -int call_nexthop_notifier(struct notifier_block *nb, struct net *net, - enum nexthop_event_type event_type, - struct nexthop *nh); int register_nexthop_notifier(struct net *net, struct notifier_block *nb); int unregister_nexthop_notifier(struct net *net, struct notifier_block *nb); |