diff options
Diffstat (limited to 'net/ipv6/mcast.c')
| -rw-r--r-- | net/ipv6/mcast.c | 34 | 
1 files changed, 5 insertions, 29 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 793159d77d8a..975021df7c1c 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -2749,19 +2749,6 @@ static const struct seq_operations igmp6_mc_seq_ops = {  	.show	=	igmp6_mc_seq_show,  }; -static int igmp6_mc_seq_open(struct inode *inode, struct file *file) -{ -	return seq_open_net(inode, file, &igmp6_mc_seq_ops, -			    sizeof(struct igmp6_mc_iter_state)); -} - -static const struct file_operations igmp6_mc_seq_fops = { -	.open		=	igmp6_mc_seq_open, -	.read		=	seq_read, -	.llseek		=	seq_lseek, -	.release	=	seq_release_net, -}; -  struct igmp6_mcf_iter_state {  	struct seq_net_private p;  	struct net_device *dev; @@ -2903,28 +2890,17 @@ static const struct seq_operations igmp6_mcf_seq_ops = {  	.show	=	igmp6_mcf_seq_show,  }; -static int igmp6_mcf_seq_open(struct inode *inode, struct file *file) -{ -	return seq_open_net(inode, file, &igmp6_mcf_seq_ops, -			    sizeof(struct igmp6_mcf_iter_state)); -} - -static const struct file_operations igmp6_mcf_seq_fops = { -	.open		=	igmp6_mcf_seq_open, -	.read		=	seq_read, -	.llseek		=	seq_lseek, -	.release	=	seq_release_net, -}; -  static int __net_init igmp6_proc_init(struct net *net)  {  	int err;  	err = -ENOMEM; -	if (!proc_create("igmp6", 0444, net->proc_net, &igmp6_mc_seq_fops)) +	if (!proc_create_net("igmp6", 0444, net->proc_net, &igmp6_mc_seq_ops, +			sizeof(struct igmp6_mc_iter_state)))  		goto out; -	if (!proc_create("mcfilter6", 0444, net->proc_net, -			 &igmp6_mcf_seq_fops)) +	if (!proc_create_net("mcfilter6", 0444, net->proc_net, +			&igmp6_mcf_seq_ops, +			sizeof(struct igmp6_mcf_iter_state)))  		goto out_proc_net_igmp6;  	err = 0;  | 
