diff options
-rw-r--r-- | include/net/tcp.h | 1 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 5 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 93479ebf3e33..58d82822414d 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -1325,7 +1325,6 @@ enum tcp_seq_states { | |||
1325 | }; | 1325 | }; |
1326 | 1326 | ||
1327 | struct tcp_seq_afinfo { | 1327 | struct tcp_seq_afinfo { |
1328 | struct module *owner; | ||
1329 | char *name; | 1328 | char *name; |
1330 | sa_family_t family; | 1329 | sa_family_t family; |
1331 | struct file_operations seq_fops; | 1330 | struct file_operations seq_fops; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 3696c83aec19..02519730e0d5 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) | |||
2232 | int rc = 0; | 2232 | int rc = 0; |
2233 | struct proc_dir_entry *p; | 2233 | struct proc_dir_entry *p; |
2234 | 2234 | ||
2235 | afinfo->seq_fops.owner = afinfo->owner; | ||
2236 | afinfo->seq_fops.open = tcp_seq_open; | 2235 | afinfo->seq_fops.open = tcp_seq_open; |
2237 | afinfo->seq_fops.read = seq_read; | 2236 | afinfo->seq_fops.read = seq_read; |
2238 | afinfo->seq_fops.llseek = seq_lseek; | 2237 | afinfo->seq_fops.llseek = seq_lseek; |
@@ -2382,9 +2381,11 @@ out: | |||
2382 | } | 2381 | } |
2383 | 2382 | ||
2384 | static struct tcp_seq_afinfo tcp4_seq_afinfo = { | 2383 | static struct tcp_seq_afinfo tcp4_seq_afinfo = { |
2385 | .owner = THIS_MODULE, | ||
2386 | .name = "tcp", | 2384 | .name = "tcp", |
2387 | .family = AF_INET, | 2385 | .family = AF_INET, |
2386 | .seq_fops = { | ||
2387 | .owner = THIS_MODULE, | ||
2388 | }, | ||
2388 | .seq_ops = { | 2389 | .seq_ops = { |
2389 | .show = tcp4_seq_show, | 2390 | .show = tcp4_seq_show, |
2390 | }, | 2391 | }, |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index e33a3dc7a000..231c4dddfb8c 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -2121,9 +2121,11 @@ out: | |||
2121 | } | 2121 | } |
2122 | 2122 | ||
2123 | static struct tcp_seq_afinfo tcp6_seq_afinfo = { | 2123 | static struct tcp_seq_afinfo tcp6_seq_afinfo = { |
2124 | .owner = THIS_MODULE, | ||
2125 | .name = "tcp6", | 2124 | .name = "tcp6", |
2126 | .family = AF_INET6, | 2125 | .family = AF_INET6, |
2126 | .seq_fops = { | ||
2127 | .owner = THIS_MODULE, | ||
2128 | }, | ||
2127 | .seq_ops = { | 2129 | .seq_ops = { |
2128 | .show = tcp6_seq_show, | 2130 | .show = tcp6_seq_show, |
2129 | }, | 2131 | }, |