[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>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 93479eb..58d8282 100644 (file)
--- 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 3696c83..0251973 100644 (file)
--- 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 e33a3dc..231c4dd 100644 (file)
--- 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,
        },