diff --git a/[refs] b/[refs] index 9ea663e23875..f97ac5d95ecb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c56a347c1dfbe384b1ffb65d8828faa36dbaea4 +refs/heads/master: c8d90dca3211966ba5189e0f3d4bccd558d9ae08 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index f1647d7dd14b..ddfef3b45bab 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -883,6 +883,9 @@ int dev_change_name(struct net_device *dev, char *newname) if (!dev_valid_name(newname)) return -EINVAL; + if (strncmp(newname, dev->name, IFNAMSIZ) == 0) + return 0; + memcpy(oldname, dev->name, IFNAMSIZ); if (strchr(newname, '%')) {