aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorOctavian Purdila <opurdila@ixiacom.com>2009-11-25 18:14:13 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-25 18:14:13 -0500
commit09ad9bc752519cc167d0a573e1acf69b5c707c67 (patch)
tree0e190a9ffb90d7e0534136c3e9f31dce02f423c3 /net/core/dev.c
parent4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905 (diff)
net: use net_eq to compare nets
Generated with the following semantic patch @@ struct net *n1; struct net *n2; @@ - n1 == n2 + net_eq(n1, n2) @@ struct net *n1; struct net *n2; @@ - n1 != n2 + !net_eq(n1, n2) applied over {include,net,drivers/net}. Signed-off-by: Octavian Purdila <opurdila@ixiacom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index ccefa2473c39..e65af6041415 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -985,7 +985,7 @@ rollback:
985 /* For now only devices in the initial network namespace 985 /* For now only devices in the initial network namespace
986 * are in sysfs. 986 * are in sysfs.
987 */ 987 */
988 if (net == &init_net) { 988 if (net_eq(net, &init_net)) {
989 ret = device_rename(&dev->dev, dev->name); 989 ret = device_rename(&dev->dev, dev->name);
990 if (ret) { 990 if (ret) {
991 memcpy(dev->name, oldname, IFNAMSIZ); 991 memcpy(dev->name, oldname, IFNAMSIZ);
@@ -4792,7 +4792,7 @@ static void rollback_registered_many(struct list_head *head)
4792 list_for_each_entry_safe(dev, aux, head, unreg_list) { 4792 list_for_each_entry_safe(dev, aux, head, unreg_list) {
4793 int new_net = 1; 4793 int new_net = 1;
4794 list_for_each_entry(fdev, &pernet_list, unreg_list) { 4794 list_for_each_entry(fdev, &pernet_list, unreg_list) {
4795 if (dev_net(dev) == dev_net(fdev)) { 4795 if (net_eq(dev_net(dev), dev_net(fdev))) {
4796 new_net = 0; 4796 new_net = 0;
4797 dev_put(dev); 4797 dev_put(dev);
4798 break; 4798 break;