diff options
| author | Stephen Worley <sworley@cumulusnetworks.com> | 2019-09-03 22:12:06 +0200 |
|---|---|---|
| committer | Stephen Worley <sworley@cumulusnetworks.com> | 2019-10-25 17:13:43 +0200 |
| commit | fec211ad95a3a2967e72d49ab3036ae01e4b3762 (patch) | |
| tree | 29de213163e289c2acdf858c3713bf17ce924117 /zebra/rt_netlink.c | |
| parent | zebra: Fix NULL check in zebra_nhg_rib_find() (diff) | |
| download | frr-fec211ad95a3a2967e72d49ab3036ae01e4b3762.tar.xz frr-fec211ad95a3a2967e72d49ab3036ae01e4b3762.zip | |
zebra: Zebra nexthop group re-work checkpatch fixes
Checkpatch fixes for the zebra nexthop group re-work.
Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
Diffstat (limited to 'zebra/rt_netlink.c')
| -rw-r--r-- | zebra/rt_netlink.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index f62670508..c24745cf1 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -75,7 +75,7 @@ static vlanid_t filter_vlan = 0; -static bool supports_nh = false; +static bool supports_nh; struct gw_family_t { uint16_t filler; @@ -1974,7 +1974,7 @@ static int netlink_nexthop(int cmd, struct zebra_dplane_ctx *ctx) req.n.nlmsg_pid = dplane_ctx_get_ns(ctx)->nls.snl.nl_pid; req.nhm.nh_family = AF_UNSPEC; - // TODO: Scope? + /* TODO: Scope? */ uint32_t id = dplane_ctx_get_nhe_id(ctx); @@ -2139,7 +2139,6 @@ enum zebra_dplane_result kernel_nexthop_update(struct zebra_dplane_ctx *ctx) "Context received for kernel nexthop update with incorrect OP code (%u)", dplane_ctx_get_op(ctx)); return ZEBRA_DPLANE_REQUEST_FAILURE; - break; } ret = netlink_nexthop(cmd, ctx); @@ -2548,7 +2547,7 @@ static int netlink_vxlan_flood_update_ctx(const struct zebra_dplane_ctx *ctx, req.n.nlmsg_type = cmd; req.ndm.ndm_family = PF_BRIDGE; req.ndm.ndm_state = NUD_NOARP | NUD_PERMANENT; - req.ndm.ndm_flags |= NTF_SELF; // Handle by "self", not "master" + req.ndm.ndm_flags |= NTF_SELF; /* Handle by "self", not "master" */ addattr_l(&req.n, sizeof(req), |