From 8e8a2d6b6c3fb8b53b0d224343dd38cc6356dfa2 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Sun, 13 Apr 2008 22:13:53 -0700
Subject: [PATCH] --- yaml --- r: 90654 b: refs/heads/master c:
 5f4472c5a640c9671ca5becaebdfd6e651482176 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/net/tcp.h   | 1 -
 trunk/net/ipv4/tcp_ipv4.c | 5 +++--
 trunk/net/ipv6/tcp_ipv6.c | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 61a7bec459df..01936dd1f53b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68fcadd16c371d5e0698ba366f33a4f990ce83ce
+refs/heads/master: 5f4472c5a640c9671ca5becaebdfd6e651482176
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index 93479ebf3e33..58d82822414d 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/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/trunk/net/ipv4/tcp_ipv4.c b/trunk/net/ipv4/tcp_ipv4.c
index 3696c83aec19..02519730e0d5 100644
--- a/trunk/net/ipv4/tcp_ipv4.c
+++ b/trunk/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 @@ 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,
 	},
diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
index e33a3dc7a000..231c4dddfb8c 100644
--- a/trunk/net/ipv6/tcp_ipv6.c
+++ b/trunk/net/ipv6/tcp_ipv6.c
@@ -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,
 	},