diff options
| author | Russ White <russ@riw.us> | 2019-09-30 07:46:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-30 07:46:19 -0400 |
| commit | 9898a2fb3441e7382dba4190233f466b8271deae (patch) | |
| tree | 9629a5ce665db95addf0d0bc0f46864ef71b5a49 /zebra/if_netlink.c | |
| parent | 5c256b572ca09b5d15b67ba0236c8a2678dda19c (diff) | |
| parent | 26f8f6fe7fb90208d4a5eb285fdf0dca83bde508 (diff) | |
Merge pull request #5009 from donaldsharp/interface_deletion
lib, zebra: Allow for interface deletion when kernel event happens
Diffstat (limited to 'zebra/if_netlink.c')
| -rw-r--r-- | zebra/if_netlink.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c index 59ab8c9d33..35cb3a6f5f 100644 --- a/zebra/if_netlink.c +++ b/zebra/if_netlink.c @@ -1385,6 +1385,13 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup) else if (IS_ZEBRA_IF_BOND_SLAVE(ifp) || was_bond_slave) zebra_l2if_update_bond_slave(ifp, bond_ifindex); } + + zif = ifp->info; + if (zif) { + XFREE(MTYPE_TMP, zif->desc); + if (desc) + zif->desc = XSTRDUP(MTYPE_TMP, desc); + } } else { /* Delete interface notification from kernel */ if (ifp == NULL) { @@ -1411,13 +1418,6 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup) if_delete_update(ifp); } - zif = ifp->info; - if (zif) { - XFREE(MTYPE_TMP, zif->desc); - if (desc) - zif->desc = XSTRDUP(MTYPE_TMP, desc); - } - return 0; } |