diff options
author | Octavian Purdila <opurdila@ixiacom.com> | 2009-11-25 18:14:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-25 18:14:13 -0500 |
commit | 09ad9bc752519cc167d0a573e1acf69b5c707c67 (patch) | |
tree | 0e190a9ffb90d7e0534136c3e9f31dce02f423c3 /net/decnet | |
parent | 4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905 (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/decnet')
-rw-r--r-- | net/decnet/af_decnet.c | 2 | ||||
-rw-r--r-- | net/decnet/dn_dev.c | 6 | ||||
-rw-r--r-- | net/decnet/dn_fib.c | 4 | ||||
-rw-r--r-- | net/decnet/dn_route.c | 4 | ||||
-rw-r--r-- | net/decnet/dn_table.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index 9ade3a6de95..2b494fac946 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -680,7 +680,7 @@ static int dn_create(struct net *net, struct socket *sock, int protocol, | |||
680 | { | 680 | { |
681 | struct sock *sk; | 681 | struct sock *sk; |
682 | 682 | ||
683 | if (net != &init_net) | 683 | if (!net_eq(net, &init_net)) |
684 | return -EAFNOSUPPORT; | 684 | return -EAFNOSUPPORT; |
685 | 685 | ||
686 | switch(sock->type) { | 686 | switch(sock->type) { |
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 6c916e2b8a8..f20dec9cfa0 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -636,7 +636,7 @@ static int dn_nl_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
636 | struct dn_ifaddr *ifa, **ifap; | 636 | struct dn_ifaddr *ifa, **ifap; |
637 | int err = -EINVAL; | 637 | int err = -EINVAL; |
638 | 638 | ||
639 | if (net != &init_net) | 639 | if (!net_eq(net, &init_net)) |
640 | goto errout; | 640 | goto errout; |
641 | 641 | ||
642 | err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy); | 642 | err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy); |
@@ -675,7 +675,7 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
675 | struct dn_ifaddr *ifa; | 675 | struct dn_ifaddr *ifa; |
676 | int err; | 676 | int err; |
677 | 677 | ||
678 | if (net != &init_net) | 678 | if (!net_eq(net, &init_net)) |
679 | return -EINVAL; | 679 | return -EINVAL; |
680 | 680 | ||
681 | err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy); | 681 | err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy); |
@@ -789,7 +789,7 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) | |||
789 | struct dn_dev *dn_db; | 789 | struct dn_dev *dn_db; |
790 | struct dn_ifaddr *ifa; | 790 | struct dn_ifaddr *ifa; |
791 | 791 | ||
792 | if (net != &init_net) | 792 | if (!net_eq(net, &init_net)) |
793 | return 0; | 793 | return 0; |
794 | 794 | ||
795 | skip_ndevs = cb->args[0]; | 795 | skip_ndevs = cb->args[0]; |
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index fd641f65e09..e9d48700e83 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c | |||
@@ -509,7 +509,7 @@ static int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void * | |||
509 | struct rtattr **rta = arg; | 509 | struct rtattr **rta = arg; |
510 | struct rtmsg *r = NLMSG_DATA(nlh); | 510 | struct rtmsg *r = NLMSG_DATA(nlh); |
511 | 511 | ||
512 | if (net != &init_net) | 512 | if (!net_eq(net, &init_net)) |
513 | return -EINVAL; | 513 | return -EINVAL; |
514 | 514 | ||
515 | if (dn_fib_check_attr(r, rta)) | 515 | if (dn_fib_check_attr(r, rta)) |
@@ -529,7 +529,7 @@ static int dn_fib_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void * | |||
529 | struct rtattr **rta = arg; | 529 | struct rtattr **rta = arg; |
530 | struct rtmsg *r = NLMSG_DATA(nlh); | 530 | struct rtmsg *r = NLMSG_DATA(nlh); |
531 | 531 | ||
532 | if (net != &init_net) | 532 | if (!net_eq(net, &init_net)) |
533 | return -EINVAL; | 533 | return -EINVAL; |
534 | 534 | ||
535 | if (dn_fib_check_attr(r, rta)) | 535 | if (dn_fib_check_attr(r, rta)) |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 860286a3921..a03284061a3 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -1517,7 +1517,7 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void | |||
1517 | struct sk_buff *skb; | 1517 | struct sk_buff *skb; |
1518 | struct flowi fl; | 1518 | struct flowi fl; |
1519 | 1519 | ||
1520 | if (net != &init_net) | 1520 | if (!net_eq(net, &init_net)) |
1521 | return -EINVAL; | 1521 | return -EINVAL; |
1522 | 1522 | ||
1523 | memset(&fl, 0, sizeof(fl)); | 1523 | memset(&fl, 0, sizeof(fl)); |
@@ -1602,7 +1602,7 @@ int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb) | |||
1602 | int h, s_h; | 1602 | int h, s_h; |
1603 | int idx, s_idx; | 1603 | int idx, s_idx; |
1604 | 1604 | ||
1605 | if (net != &init_net) | 1605 | if (!net_eq(net, &init_net)) |
1606 | return 0; | 1606 | return 0; |
1607 | 1607 | ||
1608 | if (NLMSG_PAYLOAD(cb->nlh, 0) < sizeof(struct rtmsg)) | 1608 | if (NLMSG_PAYLOAD(cb->nlh, 0) < sizeof(struct rtmsg)) |
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 67054b0d550..f281e0f59b0 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c | |||
@@ -471,7 +471,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb) | |||
471 | struct hlist_node *node; | 471 | struct hlist_node *node; |
472 | int dumped = 0; | 472 | int dumped = 0; |
473 | 473 | ||
474 | if (net != &init_net) | 474 | if (!net_eq(net, &init_net)) |
475 | return 0; | 475 | return 0; |
476 | 476 | ||
477 | if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) && | 477 | if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) && |