Skip to content

Commit

Permalink
nexthop: Pass extack to register_nexthop_notifier()
Browse files Browse the repository at this point in the history
This will be used by the next patch which extends the function to replay
all the existing nexthops to the notifier block being registered.

Device drivers will be able to pass extack to the function since it is
passed to them upon reload from devlink.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Ido Schimmel authored and Jakub Kicinski committed Nov 6, 2020
1 parent 833a106 commit ce7e9c8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion drivers/net/vxlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -4711,7 +4711,8 @@ static __net_init int vxlan_init_net(struct net *net)
for (h = 0; h < PORT_HASH_SIZE; ++h)
INIT_HLIST_HEAD(&vn->sock_list[h]);

return register_nexthop_notifier(net, &vn->nexthop_notifier_block);
return register_nexthop_notifier(net, &vn->nexthop_notifier_block,
NULL);
}

static void vxlan_destroy_tunnels(struct net *net, struct list_head *head)
Expand Down
3 changes: 2 additions & 1 deletion include/net/nexthop.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ struct nh_notifier_info {
};
};

int register_nexthop_notifier(struct net *net, struct notifier_block *nb);
int register_nexthop_notifier(struct net *net, struct notifier_block *nb,
struct netlink_ext_ack *extack);
int unregister_nexthop_notifier(struct net *net, struct notifier_block *nb);
void nexthop_set_hw_flags(struct net *net, u32 id, bool offload, bool trap);

Expand Down
3 changes: 2 additions & 1 deletion net/ipv4/nexthop.c
Original file line number Diff line number Diff line change
Expand Up @@ -2118,7 +2118,8 @@ static struct notifier_block nh_netdev_notifier = {
.notifier_call = nh_netdev_event,
};

int register_nexthop_notifier(struct net *net, struct notifier_block *nb)
int register_nexthop_notifier(struct net *net, struct notifier_block *nb,
struct netlink_ext_ack *extack)
{
return blocking_notifier_chain_register(&net->nexthop.notifier_chain,
nb);
Expand Down

0 comments on commit ce7e9c8

Please sign in to comment.