From 91d24636a30118e47b6ae848c701d99daa533761 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Tue, 10 Jun 2008 15:40:04 -0700 Subject: [PATCH] --- yaml --- r: 102856 b: refs/heads/master c: 573bf470e693f73a6ac437b17a64a10902ba54bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/devinet.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index db88176b97c6..8fe85e672475 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5ec514016d1a65922465372ff1e6748e6f7dea9 +refs/heads/master: 573bf470e693f73a6ac437b17a64a10902ba54bf diff --git a/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c index 79a7ef6209ff..61011e1d580e 100644 --- a/trunk/net/ipv4/devinet.c +++ b/trunk/net/ipv4/devinet.c @@ -1013,7 +1013,7 @@ static void inetdev_changename(struct net_device *dev, struct in_device *in_dev) memcpy(old, ifa->ifa_label, IFNAMSIZ); memcpy(ifa->ifa_label, dev->name, IFNAMSIZ); if (named++ == 0) - continue; + goto skip; dot = strchr(old, ':'); if (dot == NULL) { sprintf(old, ":%d", named); @@ -1024,6 +1024,8 @@ static void inetdev_changename(struct net_device *dev, struct in_device *in_dev) } else { strcpy(ifa->ifa_label + (IFNAMSIZ - strlen(dot) - 1), dot); } +skip: + rtmsg_ifa(RTM_NEWADDR, ifa, NULL, 0); } }