aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-04-13 22:13:53 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-13 22:13:53 -0700
commit5f4472c5a640c9671ca5becaebdfd6e651482176 (patch)
treee4efabf6e55c820968facc5c1c9fe5d469e5046b
parent68fcadd16c371d5e0698ba366f33a4f990ce83ce (diff)
[TCP]: Remove owner from tcp_seq_afinfo.
Move it to tcp_seq_afinfo->seq_fops as should be. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/tcp.h1
-rw-r--r--net/ipv4/tcp_ipv4.c5
-rw-r--r--net/ipv6/tcp_ipv6.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 93479ebf3e3..58d82822414 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -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;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 3696c83aec1..02519730e0d 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -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 @@ out:
}
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,
},
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index e33a3dc7a00..231c4dddfb8 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2121,9 +2121,11 @@ out:
}
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,
},