Commit 5f4472c5 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[TCP]: Remove owner from tcp_seq_afinfo. 



Move it to tcp_seq_afinfo->seq_fops as should be.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68fcadd1

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,6 @@ enum tcp_seq_states { 
};



struct tcp_seq_afinfo {

	struct module		*owner;

	char			*name;

	sa_family_t		family;

	struct file_operations	seq_fops;

net/ipv4/tcp_ipv4.c

+3 −2
Original line number Diff line number Diff line
@@ -2232,7 +2232,6 @@ int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo) 
	int rc = 0;

	struct proc_dir_entry *p;



	afinfo->seq_fops.owner		= afinfo->owner;

	afinfo->seq_fops.open		= tcp_seq_open;

	afinfo->seq_fops.read		= seq_read;

	afinfo->seq_fops.llseek		= seq_lseek;
@@ -2382,9 +2381,11 @@ static int tcp4_seq_show(struct seq_file *seq, void *v) 
}



static struct tcp_seq_afinfo tcp4_seq_afinfo = {

	.owner		= THIS_MODULE,

	.name		= "tcp",

	.family		= AF_INET,

	.seq_fops	= {

		.owner		= THIS_MODULE,

	},

	.seq_ops	= {

		.show		= tcp4_seq_show,

	},

net/ipv6/tcp_ipv6.c

+3 −1
Original line number Diff line number Diff line
@@ -2121,9 +2121,11 @@ static int tcp6_seq_show(struct seq_file *seq, void *v) 
}



static struct tcp_seq_afinfo tcp6_seq_afinfo = {

	.owner		= THIS_MODULE,

	.name		= "tcp6",

	.family		= AF_INET6,

	.seq_fops	= {

		.owner		= THIS_MODULE,

	},

	.seq_ops	= {

		.show		= tcp6_seq_show,

	},