net: use net_eq to compare nets
Subsystems (16)
PATCH 1/1 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 <[email protected]>
--- drivers/net/hamradio/bpqether.c | 4 ++-- drivers/net/loopback.c | 2 +- drivers/net/wan/hdlc.c | 4 ++-- net/appletalk/ddp.c | 2 +- net/atm/svc.c | 2 +- net/ax25/af_ax25.c | 2 +- net/can/af_can.c | 2 +- net/core/dev.c | 4 ++-- net/core/neighbour.c | 2 +- net/core/net-sysfs.c | 4 ++-- net/core/net_namespace.c | 2 +- net/core/sysctl_net_core.c | 2 +- net/dcb/dcbnl.c | 2 +- net/decnet/af_decnet.c | 2 +- net/decnet/dn_dev.c | 6 +++--- net/decnet/dn_fib.c | 4 ++-- net/decnet/dn_route.c | 4 ++-- net/decnet/dn_table.c | 2 +- net/econet/af_econet.c | 2 +- net/ieee802154/af_ieee802154.c | 2 +- net/ipv4/devinet.c | 2 +- net/ipv4/fib_semantics.c | 4 ++-- net/ipv4/inet_connection_sock.c | 4 ++-- net/ipv4/inet_hashtables.c | 3 ++- net/ipv4/ip_fragment.c | 4 ++-- net/ipv4/ip_input.c | 2 +- net/ipv4/netfilter/ip_queue.c | 2 +- net/ipv4/route.c | 4 ++-- net/ipv4/sysctl_net_ipv4.c | 4 ++-- net/ipv6/addrconf.c | 4 ++-- net/ipv6/ip6_flowlabel.c | 9 +++++---- net/ipv6/netfilter/ip6_queue.c | 2 +- net/ipv6/reassembly.c | 4 ++-- net/ipx/af_ipx.c | 2 +- net/llc/af_llc.c | 2 +- net/netfilter/nfnetlink_log.c | 2 +- net/netlink/af_netlink.c | 2 +- net/netrom/af_netrom.c | 2 +- net/packet/af_packet.c | 6 +++--- net/rose/af_rose.c | 2 +- net/rxrpc/af_rxrpc.c | 2 +- net/sched/act_api.c | 4 ++-- net/sched/cls_api.c | 4 ++-- net/sched/sch_api.c | 10 +++++----- net/tipc/socket.c | 2 +- net/x25/af_x25.c | 2 +- 46 files changed, 74 insertions(+), 72 deletions(-)
drivers/net/hamradio/bpqether.c +2 -2
@@ -186,7 +186,7 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_tystruct ethhdr *eth;struct bpqdev *bpq; -if (dev_net (dev) != &init_net) +if (!net_eq (dev_net (dev), &init_net)) goto drop;if ((skb =skb_share_check (skb,GFP_ATOMIC )) ==NULL )
@@ -552,7 +552,7 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi {struct net_device *dev = (struct net_device *)ptr; -if (dev_net (dev) != &init_net) +if (!net_eq (dev_net (dev), &init_net))return NOTIFY_DONE ;if (!dev_is_ethdev (dev))
drivers/net/loopback.c +1 -1
@@ -207,7 +207,7 @@ static __net_init int loopback_net_init(struct net *net) out_free_netdev:free_netdev (dev); out: -if (net == &init_net) +if (net_eq (net, &init_net))panic ("loopback: Failed to register netdevice: %d\n" , err);return err; }
drivers/net/wan/hdlc.c +2 -2
@@ -57,7 +57,7 @@ static int hdlc_rcv(struct sk_buff *skb, struct net_device *dev, {struct hdlc_device *hdlc =dev_to_hdlc (dev); -if (dev_net (dev) != &init_net) { +if (!net_eq (dev_net (dev), &init_net)) {kfree_skb (skb);return 0 ; }
@@ -102,7 +102,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event,unsigned long flags;int on; -if (dev_net (dev) != &init_net) +if (!net_eq (dev_net (dev), &init_net))return NOTIFY_DONE ;if (!(dev->priv_flags &IFF_WAN_HDLC ))
net/appletalk/ddp.c +1 -1
@@ -1023,7 +1023,7 @@ static int atalk_create(struct net *net, struct socket *sock, int protocol,struct sock *sk;int rc = -ESOCKTNOSUPPORT ; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;/*
net/atm/svc.c +1 -1
@@ -655,7 +655,7 @@ static int svc_create(struct net *net, struct socket *sock, int protocol, {int error; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ; sock->ops = &svc_proto_ops;
net/ax25/af_ax25.c +1 -1
@@ -805,7 +805,7 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol,struct sock *sk;ax25_cb *ax25; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;switch (sock->type) {
net/can/af_can.c +1 -1
@@ -126,7 +126,7 @@ static int can_create(struct net *net, struct socket *sock, int protocol,if (protocol <0 || protocol >=CAN_NPROTO )return -EINVAL ; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;#ifdef CONFIG_MODULES
net/core/dev.c +2 -2
@@ -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 ;
net/core/neighbour.c +1 -1
@@ -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;
net/core/net-sysfs.c +2 -2
@@ -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);
net/core/net_namespace.c +1 -1
@@ -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); }
net/core/sysctl_net_core.c +1 -1
@@ -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;
net/dcb/dcbnl.c +1 -1
@@ -1126,7 +1126,7 @@ static int dcb_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)u32 pid = skb ?NETLINK_CB (skb).pid :0 ;int ret = -EINVAL ; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ; ret = nlmsg_parse(nlh, sizeof(*dcb), tb, DCB_ATTR_MAX,
net/decnet/af_decnet.c +1 -1
@@ -680,7 +680,7 @@ static int dn_create(struct net *net, struct socket *sock, int protocol, {struct sock *sk; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;switch (sock->type) {
net/decnet/dn_dev.c +3 -3
@@ -636,7 +636,7 @@ static int dn_nl_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)struct dn_ifaddr *ifa, **ifap;int err = -EINVAL ; -if (net != &init_net) +if (!net_eq (net, &init_net)) goto errout; 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)struct dn_ifaddr *ifa;int err; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ; 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)struct dn_dev *dn_db;struct dn_ifaddr *ifa; -if (net != &init_net) +if (!net_eq (net, &init_net))return 0 ; skip_ndevs = cb->args[0 ];
net/decnet/dn_fib.c +2 -2
@@ -509,7 +509,7 @@ static int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *struct rtattr **rta = arg;struct rtmsg *r =NLMSG_DATA (nlh); -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ;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 *struct rtattr **rta = arg;struct rtmsg *r =NLMSG_DATA (nlh); -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ;if (dn_fib_check_attr (r, rta))
net/decnet/dn_route.c +2 -2
@@ -1517,7 +1517,7 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, voidstruct sk_buff *skb;struct flowi fl; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ;memset (&fl,0 ,sizeof (fl));
@@ -1602,7 +1602,7 @@ int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb)int h, s_h;int idx, s_idx; -if (net != &init_net) +if (!net_eq (net, &init_net))return 0 ;if (NLMSG_PAYLOAD (cb->nlh,0 ) <sizeof (struct rtmsg ))
net/decnet/dn_table.c +1 -1
@@ -471,7 +471,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)struct hlist_node *node;int dumped =0 ; -if (net != &init_net) +if (!net_eq (net, &init_net))return 0 ; if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) &&
net/econet/af_econet.c +1 -1
@@ -612,7 +612,7 @@ static int econet_create(struct net *net, struct socket *sock, int protocol,struct econet_sock *eo;int err; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;/* Econet only provides datagram services. */
net/ieee802154/af_ieee802154.c +1 -1
@@ -241,7 +241,7 @@ static int ieee802154_create(struct net *net, struct socket *sock,struct proto *proto;const struct proto_ops *ops; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;switch (sock->type) {
net/ipv4/devinet.c +1 -1
@@ -1605,7 +1605,7 @@ static __net_init int devinet_init_net(struct net *net) all = &ipv4_devconf; dflt = &ipv4_devconf_dflt; -if (net != &init_net) { +if (!net_eq (net, &init_net)) { all =kmemdup (all,sizeof (ipv4_devconf),GFP_KERNEL );if (all ==NULL ) goto err_alloc_all;
net/ipv4/fib_semantics.c +2 -2
@@ -228,7 +228,7 @@ static struct fib_info *fib_find_info(const struct fib_info *nfi) head = &fib_info_hash[hash];hlist_for_each_entry (fi, node, head, fib_hash) { -if (fi->fib_net != nfi->fib_net) +if (!net_eq (fi->fib_net, nfi->fib_net))continue ;if (fi->fib_nhs != nfi->fib_nhs)continue ;
@@ -1047,7 +1047,7 @@ int fib_sync_down_addr(struct net *net, __be32 local)return 0 ;hlist_for_each_entry (fi, node, head, fib_lhash) { -if (fi->fib_net != net) +if (!net_eq (fi->fib_net, net))continue ;if (fi->fib_prefsrc == local) { fi->fib_flags |=RTNH_F_DEAD ;
net/ipv4/inet_connection_sock.c +2 -2
@@ -112,7 +112,7 @@ again: hashinfo->bhash_size)];spin_lock (&head->lock);inet_bind_bucket_for_each (tb, node, &head->chain) -if (ib_net (tb) == net && tb->port == rover) { +if (net_eq (ib_net (tb), net) && tb->port == rover) { if (tb->fastreuse > 0 && sk->sk_reuse && sk->sk_state != TCP_LISTEN &&
@@ -158,7 +158,7 @@ have_snum: hashinfo->bhash_size)];spin_lock (&head->lock);inet_bind_bucket_for_each (tb, node, &head->chain) -if (ib_net (tb) == net && tb->port == snum) +if (net_eq (ib_net (tb), net) && tb->port == snum) goto tb_found; } tb =NULL ;
net/ipv4/inet_hashtables.c +2 -1
@@ -454,7 +454,8 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row,* unique enough. */ inet_bind_bucket_for_each (tb, node, &head->chain) { -if (ib_net (tb) == net && tb->port == port) { +if (net_eq (ib_net (tb), net) && + tb->port == port) {if (tb->fastreuse >=0 ) goto next_port;WARN_ON (hlist_empty (&tb->owners));
net/ipv4/ip_fragment.c +2 -2
@@ -658,7 +658,7 @@ static int ip4_frags_ns_ctl_register(struct net *net)struct ctl_table_header *hdr; table = ip4_frags_ns_ctl_table; -if (net != &init_net) { +if (!net_eq (net, &init_net)) { table =kmemdup (table,sizeof (ip4_frags_ns_ctl_table),GFP_KERNEL );if (table ==NULL ) goto err_alloc;
@@ -676,7 +676,7 @@ static int ip4_frags_ns_ctl_register(struct net *net)return 0 ; err_reg: -if (net != &init_net) +if (!net_eq (net, &init_net))kfree (table); err_alloc:return -ENOMEM ;
net/ipv4/ip_input.c +1 -1
@@ -164,7 +164,7 @@ int ip_call_ra_chain(struct sk_buff *skb)if (sk &&inet_sk (sk)->inet_num == protocol && (!sk->sk_bound_dev_if || sk->sk_bound_dev_if == dev->ifindex) && -sock_net (sk) ==dev_net (dev)) { +net_eq (sock_net (sk),dev_net (dev))) {if (ip_hdr (skb)->frag_off &htons (IP_MF |IP_OFFSET )) {if (ip_defrag (skb,IP_DEFRAG_CALL_RA_CHAIN )) {read_unlock (&ip_ra_lock);
net/ipv4/netfilter/ip_queue.c +1 -1
@@ -500,7 +500,7 @@ ipq_rcv_nl_event(struct notifier_block *this,if (event ==NETLINK_URELEASE && n->protocol ==NETLINK_FIREWALL && n->pid) {write_lock_bh (&queue_lock); -if ((n->net == &init_net) && (n->pid == peer_pid)) +if ((net_eq (n->net, &init_net)) && (n->pid == peer_pid))__ipq_reset ();write_unlock_bh (&queue_lock); }
net/ipv4/route.c +2 -2
@@ -703,7 +703,7 @@ static inline int compare_keys(struct flowi *fl1, struct flowi *fl2)static inline int compare_netns (struct rtable *rt1,struct rtable *rt2) { -return dev_net (rt1->u.dst.dev) ==dev_net (rt2->u.dst.dev); +return net_eq (dev_net (rt1->u.dst.dev),dev_net (rt2->u.dst.dev)); }static inline int rt_is_expired (struct rtable *rth)
@@ -3310,7 +3310,7 @@ static __net_init int sysctl_route_net_init(struct net *net)struct ctl_table *tbl; tbl = ipv4_route_flush_table; -if (net != &init_net) { +if (!net_eq (net, &init_net)) { tbl =kmemdup (tbl,sizeof (ipv4_route_flush_table),GFP_KERNEL );if (tbl ==NULL ) goto err_dup;
net/ipv4/sysctl_net_ipv4.c +2 -2
@@ -818,7 +818,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)struct ctl_table *table; table = ipv4_net_table; -if (net != &init_net) { +if (!net_eq (net, &init_net)) { table =kmemdup (table,sizeof (ipv4_net_table),GFP_KERNEL );if (table ==NULL ) goto err_alloc;
@@ -849,7 +849,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)return 0 ; err_reg: -if (net != &init_net) +if (!net_eq (net, &init_net))kfree (table); err_alloc:return -ENOMEM ;
net/ipv6/addrconf.c +2 -2
@@ -4498,7 +4498,7 @@ static int addrconf_init_net(struct net *net) all = &ipv6_devconf; dflt = &ipv6_devconf_dflt; -if (net != &init_net) { +if (!net_eq (net, &init_net)) { all =kmemdup (all,sizeof (ipv6_devconf),GFP_KERNEL );if (all ==NULL ) goto err_alloc_all;
@@ -4546,7 +4546,7 @@ static void addrconf_exit_net(struct net *net)__addrconf_sysctl_unregister (net->ipv6.devconf_dflt);__addrconf_sysctl_unregister (net->ipv6.devconf_all);#endif -if (net != &init_net) { +if (!net_eq (net, &init_net)) {kfree (net->ipv6.devconf_dflt);kfree (net->ipv6.devconf_all); }
net/ipv6/ip6_flowlabel.c +5 -4
@@ -67,7 +67,7 @@ static inline struct ip6_flowlabel *__fl_lookup(struct net *net, __be32 label)struct ip6_flowlabel *fl;for (fl=fl_ht[FL_HASH (label)]; fl; fl = fl->next) { -if (fl->label == label && fl->fl_net == net) +if (fl->label == label &&net_eq (fl->fl_net, net))return fl; }return NULL ;
@@ -163,7 +163,8 @@ static void ip6_fl_purge(struct net *net)struct ip6_flowlabel *fl, **flp; flp = &fl_ht[i];while ((fl = *flp) !=NULL ) { -if (fl->fl_net == net &&atomic_read (&fl->users) ==0 ) { +if (net_eq (fl->fl_net, net) && +atomic_read (&fl->users) ==0 ) { *flp = fl->next;fl_free (fl);atomic_dec (&fl_size);
@@ -630,7 +631,7 @@ static struct ip6_flowlabel *ip6fl_get_first(struct seq_file *seq)for (state->bucket =0 ; state->bucket <=FL_HASH_MASK ; ++state->bucket) { fl = fl_ht[state->bucket]; -while (fl && fl->fl_net != net) +while (fl && !net_eq (fl->fl_net, net)) fl = fl->next;if (fl)break ;
@@ -645,7 +646,7 @@ static struct ip6_flowlabel *ip6fl_get_next(struct seq_file *seq, struct ip6_flo fl = fl->next; try_again: -while (fl && fl->fl_net != net) +while (fl && !net_eq (fl->fl_net, net)) fl = fl->next;while (!fl) {
net/ipv6/netfilter/ip6_queue.c +1 -1
@@ -502,7 +502,7 @@ ipq_rcv_nl_event(struct notifier_block *this,if (event ==NETLINK_URELEASE && n->protocol ==NETLINK_IP6_FW && n->pid) {write_lock_bh (&queue_lock); -if ((n->net == &init_net) && (n->pid == peer_pid)) +if ((net_eq (n->net, &init_net)) && (n->pid == peer_pid))__ipq_reset ();write_unlock_bh (&queue_lock); }
net/ipv6/reassembly.c +2 -2
@@ -681,7 +681,7 @@ static int ip6_frags_ns_sysctl_register(struct net *net)struct ctl_table_header *hdr; table = ip6_frags_ns_ctl_table; -if (net != &init_net) { +if (!net_eq (net, &init_net)) { table =kmemdup (table,sizeof (ip6_frags_ns_ctl_table),GFP_KERNEL );if (table ==NULL ) goto err_alloc;
@@ -699,7 +699,7 @@ static int ip6_frags_ns_sysctl_register(struct net *net)return 0 ; err_reg: -if (net != &init_net) +if (!net_eq (net, &init_net))kfree (table); err_alloc:return -ENOMEM ;
net/ipx/af_ipx.c +1 -1
@@ -1362,7 +1362,7 @@ static int ipx_create(struct net *net, struct socket *sock, int protocol,int rc = -ESOCKTNOSUPPORT ;struct sock *sk; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;/*
net/llc/af_llc.c +1 -1
@@ -158,7 +158,7 @@ static int llc_ui_create(struct net *net, struct socket *sock, int protocol,if (!capable (CAP_NET_RAW ))return -EPERM ; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;if (likely (sock->type ==SOCK_DGRAM || sock->type ==SOCK_STREAM )) {
net/netfilter/nfnetlink_log.c +1 -1
@@ -678,7 +678,7 @@ nfulnl_rcv_nl_event(struct notifier_block *this,struct hlist_head *head = &instance_table[i];hlist_for_each_entry_safe (inst, tmp, t2, head, hlist) { -if ((n->net == &init_net) && +if ((net_eq (n->net, &init_net)) && (n->pid == inst->peer_pid))__instance_destroy (inst); }
net/netlink/af_netlink.c +1 -1
@@ -1092,7 +1092,7 @@ static inline int do_one_set_err(struct sock *sk,if (sk == p->exclude_sk) goto out; -if (sock_net (sk) !=sock_net (p->exclude_sk)) +if (!net_eq (sock_net (sk),sock_net (p->exclude_sk))) goto out; if (nlk->pid == p->pid || p->group - 1 >= nlk->ngroups ||
net/netrom/af_netrom.c +1 -1
@@ -431,7 +431,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol,struct sock *sk;struct nr_sock *nr; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;if (sock->type !=SOCK_SEQPACKET || protocol !=0 )
net/packet/af_packet.c +3 -3
@@ -365,7 +365,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev,if (skb->pkt_type ==PACKET_LOOPBACK ) goto out; -if (dev_net (dev) !=sock_net (sk)) +if (!net_eq (dev_net (dev),sock_net (sk))) goto out; skb =skb_share_check (skb,GFP_ATOMIC );
@@ -553,7 +553,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, sk = pt->af_packet_priv; po =pkt_sk (sk); -if (dev_net (dev) !=sock_net (sk)) +if (!net_eq (dev_net (dev),sock_net (sk))) goto drop; skb->dev = dev;
@@ -674,7 +674,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, sk = pt->af_packet_priv; po =pkt_sk (sk); -if (dev_net (dev) !=sock_net (sk)) +if (!net_eq (dev_net (dev),sock_net (sk))) goto drop;if (dev->header_ops) {
net/rose/af_rose.c +1 -1
@@ -518,7 +518,7 @@ static int rose_create(struct net *net, struct socket *sock, int protocol,struct sock *sk;struct rose_sock *rose; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;if (sock->type !=SOCK_SEQPACKET || protocol !=0 )
net/rxrpc/af_rxrpc.c +1 -1
@@ -616,7 +616,7 @@ static int rxrpc_create(struct net *net, struct socket *sock, int protocol,_enter ("%p,%d" , sock, protocol); -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;/* we support transport protocol UDP only */
net/sched/act_api.c +2 -2
@@ -969,7 +969,7 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, void *arg)u32 pid = skb ?NETLINK_CB (skb).pid :0 ;int ret =0 , ovr =0 ; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ; ret =nlmsg_parse (n,sizeof (struct tcamsg ), tca,TCA_ACT_MAX ,NULL );
@@ -1052,7 +1052,7 @@ tc_dump_action(struct sk_buff *skb, struct netlink_callback *cb)struct tcamsg *t = (struct tcamsg *)NLMSG_DATA (cb->nlh);struct nlattr *kind =find_dump_kind (cb->nlh); -if (net != &init_net) +if (!net_eq (net, &init_net))return 0 ;if (kind ==NULL ) {
net/sched/cls_api.c +2 -2
@@ -137,7 +137,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)int err;int tp_created =0 ; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ; replay:
@@ -418,7 +418,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)const struct Qdisc_class_ops *cops;struct tcf_dump_args arg; -if (net != &init_net) +if (!net_eq (net, &init_net))return 0 ;if (cb->nlh->nlmsg_len <NLMSG_LENGTH (sizeof (*tcm)))
net/sched/sch_api.c +5 -5
@@ -947,7 +947,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)struct Qdisc *p =NULL ;int err; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ;if ((dev =__dev_get_by_index (&init_net, tcm->tcm_ifindex)) ==NULL )
@@ -1009,7 +1009,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)struct Qdisc *q, *p;int err; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ; replay:
@@ -1274,7 +1274,7 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)int s_idx, s_q_idx;struct net_device *dev; -if (net != &init_net) +if (!net_eq (net, &init_net))return 0 ; s_idx = cb->args[0 ];
@@ -1334,7 +1334,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)u32 qid =TC_H_MAJ (clid);int err; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EINVAL ;if ((dev =__dev_get_by_index (&init_net, tcm->tcm_ifindex)) ==NULL )
@@ -1576,7 +1576,7 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)struct net_device *dev;int t, s_t; -if (net != &init_net) +if (!net_eq (net, &init_net))return 0 ;if (cb->nlh->nlmsg_len <NLMSG_LENGTH (sizeof (*tcm)))
net/tipc/socket.c +1 -1
@@ -195,7 +195,7 @@ static int tipc_create(struct net *net, struct socket *sock, int protocol,/* Validate arguments */ -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;if (unlikely (protocol !=0 ))
net/x25/af_x25.c +1 -1
@@ -514,7 +514,7 @@ static int x25_create(struct net *net, struct socket *sock, int protocol,struct x25_sock *x25;int rc = -ESOCKTNOSUPPORT ; -if (net != &init_net) +if (!net_eq (net, &init_net))return -EAFNOSUPPORT ;if (sock->type !=SOCK_SEQPACKET || protocol)
Signature · 1 line
1.5.6.5
From: Octavian Purdila <[email protected]>
Date: Thu, 26 Nov 2009 00:51:17 +0200
Quoted 1 line
Signed-off-by Octavian Purdila <[email protected]>
Applied, thanks.