diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 10:26:59 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 10:26:59 +0200 |
| commit | f38bb7de289f5c15e287386d35e9c325f1062c49 (patch) | |
| tree | 38e69a9ecea18243e3f66bcf51bc89cd7b8f0c94 /net/core/dev.c | |
| parent | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (diff) | |
| parent | c3b25b32e8bef526cca748e1ba023c6bdd705a99 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a1607bc0cd4..58296307787 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -903,7 +903,11 @@ int dev_change_name(struct net_device *dev, char *newname) strlcpy(dev->name, newname, IFNAMSIZ); rollback: - device_rename(&dev->dev, dev->name); + err = device_rename(&dev->dev, dev->name); + if (err) { + memcpy(dev->name, oldname, IFNAMSIZ); + return err; + } write_lock_bh(&dev_base_lock); hlist_del(&dev->name_hlist); @@ -3137,7 +3141,7 @@ int dev_change_flags(struct net_device *dev, unsigned flags) * Load in the correct multicast list now the flags have changed. */ - if (dev->change_rx_flags && (dev->flags ^ flags) & IFF_MULTICAST) + if (dev->change_rx_flags && (old_flags ^ flags) & IFF_MULTICAST) dev->change_rx_flags(dev, IFF_MULTICAST); dev_set_rx_mode(dev); |