From 177fec0b82d18dc92fe40b51bf1a4a294fb9a7ff Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 17 Dec 2008 09:31:47 -0800 Subject: Revert "Revised version if interface renaming" This reverts commit 3b1779981cd67679dd4cddd70160859ca3d862d7. Conflicts: zebra/rt_netlink.c --- zebra/rt_netlink.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'zebra/rt_netlink.c') diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 6d4df405..e9ddd737 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -987,24 +987,6 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h) /* If new link is added. */ if_add_update (ifp); } - /* Interface name change */ - else if (strcmp(ifp->name, name) != 0) - { - ifp->mtu6 = ifp->mtu = mtu; - - zlog_info("interface index %d was renamed from %s to %s", - ifi->ifi_index, ifp->name, name); - - if_delete_update(ifp); - - ifp = if_create(name, strlen(name)); - ifp->ifindex = ifi->ifindex; - ifp->metric = 1; - ifp->mtu = ifp->mtu6 = mtu; - ifp->flags = new_flags; - - if_add_update (ifp); - } /* Interface status change. */ else if (new_flags != ifp->flags) { @@ -1029,6 +1011,15 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h) if_up (ifp); } } + /* Interface name change */ + else if (strcmp(ifp->name, name) != 0) + { + ifp->mtu = ifp->mtu6 = mtu; + zlog_info("interface index %d was renamed from %s to %s", + ifi->ifi_index, ifp->name, name); + + if_rename (ifp, name); + } /* Interface mtu change */ else if (mtu != ifp->mtu) { -- cgit v1.2.3