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>

5 files changed, 7 insertions, 7 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:
         /* For now only devices in the initial network namespace
          * are in sysfs.
          */
-        if (net == &init_net) {
+        if (net_eq(net, &init_net)) {
                 ret = device_rename(&dev->dev, dev->name);
                 if (ret) {
                         memcpy(dev->name, oldname, IFNAMSIZ);
@@ -4792,7 +4792,7 @@ static void rollback_registered_many(struct list_head *head)
         list_for_each_entry_safe(dev, aux, head, unreg_list) {
                 int new_net = 1;
                 list_for_each_entry(fdev, &pernet_list, unreg_list) {
-                        if (dev_net(dev) == dev_net(fdev)) {
+                        if (net_eq(dev_net(dev), dev_net(fdev))) {
                                 new_net = 0;
                                 dev_put(dev);
                                 break;
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index e587e6819698..a08a35bf0a7b 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2092,7 +2092,7 @@ static int neigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb,
                 if (h > s_h)
                         s_idx = 0;
                 for (n = tbl->hash_buckets[h], idx = 0; n; n = n->next) {
-                        if (dev_net(n->dev) != net)
+                        if (!net_eq(dev_net(n->dev), net))
                                 continue;
                         if (idx < s_idx)
                                 goto next;
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 157645c0da73..fbc1c7472c5e 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -525,7 +525,7 @@ void netdev_unregister_kobject(struct net_device * net)
 
         kobject_get(&dev->kobj);
 
-        if (dev_net(net) != &init_net)
+        if (!net_eq(dev_net(net), &init_net))
                 return;
 
         device_del(dev);
@@ -559,7 +559,7 @@ int netdev_register_kobject(struct net_device *net)
 #endif
 #endif /* CONFIG_SYSFS */
 
-        if (dev_net(net) != &init_net)
+        if (!net_eq(dev_net(net), &init_net))
                 return 0;
 
         return device_add(dev);
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 1c1af2756f38..86ed7f44d083 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -280,7 +280,7 @@ out_undo:
         list_del(&ops->list);
         if (ops->exit) {
                 for_each_net(undo_net) {
-                        if (undo_net == net)
+                        if (net_eq(undo_net, net))
                                 goto undone;
                         ops->exit(undo_net);
                 }
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 7db1de0497c6..fcfc5458c399 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -134,7 +134,7 @@ static __net_init int sysctl_core_net_init(struct net *net)
         net->core.sysctl_somaxconn = SOMAXCONN;
 
         tbl = netns_core_table;
-        if (net != &init_net) {
+        if (!net_eq(net, &init_net)) {
                 tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
                 if (tbl == NULL)
                         goto err_dup;