diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2008-01-15 23:25:01 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@kernel.org> | 2008-01-16 01:48:09 +0200 |
| commit | ffcf747658eff56a00c1606b5d064ea9b6611668 (patch) | |
| tree | 911f0857cf69b5e7a434372064f258bd73f9e3ea | |
| parent | d97b07efe475fc99271820c8c45db3092c99774d (diff) | |
[INET]: Fix netdev renaming and inet address labels
[ Upstream commit: 44344b2a85f03326c7047a8c861b0c625c674839 ]
When re-naming an interface, the previous secondary address
labels get lost e.g.
$> brctl addbr foo
$> ip addr add 192.168.0.1 dev foo
$> ip addr add 192.168.0.2 dev foo label foo:00
$> ip addr show dev foo | grep inet
inet 192.168.0.1/32 scope global foo
inet 192.168.0.2/32 scope global foo:00
$> ip link set foo name bar
$> ip addr show dev bar | grep inet
inet 192.168.0.1/32 scope global bar
inet 192.168.0.2/32 scope global bar:2
Turns out to be a simple thinko in inetdev_changename() - clearly we
want to look at the address label, rather than the device name, for
a suffix to retain.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
| -rw-r--r-- | net/ipv4/devinet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 73a62007e36e..4f88e2ef57fd 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -962,7 +962,7 @@ static void inetdev_changename(struct net_device *dev, struct in_device *in_dev) memcpy(ifa->ifa_label, dev->name, IFNAMSIZ); if (named++ == 0) continue; - dot = strchr(ifa->ifa_label, ':'); + dot = strchr(old, ':'); if (dot == NULL) { sprintf(old, ":%d", named); dot = old; |