diff options
author | Denis V. Lunev <den@openvz.org> | 2008-10-07 17:46:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-07 17:46:47 -0400 |
commit | 35f0a5df6cbc315da031c40541e135a059bfde7d (patch) | |
tree | 769aee7f786d768c09c01033cbcf6037790ce805 /net | |
parent | 06f38527decedbea0588256ecbb5784d4bb35b81 (diff) |
ipv6: consolidate ipv6 sock_stat code at the beginning of net/ipv6/proc.c
Simple, comsolidate sockstat6 staff in one place, at the beginning of
the file. Right now sockstat6_seq_open/sockstat6_seq_fops looks like an
intrusion in the middle of snmp6 code.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/proc.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index 57640620c165..25eda8bf2182 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c | |||
@@ -46,6 +46,19 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v) | |||
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |
48 | 48 | ||
49 | static int sockstat6_seq_open(struct inode *inode, struct file *file) | ||
50 | { | ||
51 | return single_open_net(inode, file, sockstat6_seq_show); | ||
52 | } | ||
53 | |||
54 | static const struct file_operations sockstat6_seq_fops = { | ||
55 | .owner = THIS_MODULE, | ||
56 | .open = sockstat6_seq_open, | ||
57 | .read = seq_read, | ||
58 | .llseek = seq_lseek, | ||
59 | .release = single_release_net, | ||
60 | }; | ||
61 | |||
49 | static struct snmp_mib snmp6_ipstats_list[] = { | 62 | static struct snmp_mib snmp6_ipstats_list[] = { |
50 | /* ipv6 mib according to RFC 2465 */ | 63 | /* ipv6 mib according to RFC 2465 */ |
51 | SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INRECEIVES), | 64 | SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INRECEIVES), |
@@ -179,19 +192,6 @@ static int snmp6_seq_show(struct seq_file *seq, void *v) | |||
179 | return 0; | 192 | return 0; |
180 | } | 193 | } |
181 | 194 | ||
182 | static int sockstat6_seq_open(struct inode *inode, struct file *file) | ||
183 | { | ||
184 | return single_open_net(inode, file, sockstat6_seq_show); | ||
185 | } | ||
186 | |||
187 | static const struct file_operations sockstat6_seq_fops = { | ||
188 | .owner = THIS_MODULE, | ||
189 | .open = sockstat6_seq_open, | ||
190 | .read = seq_read, | ||
191 | .llseek = seq_lseek, | ||
192 | .release = single_release_net, | ||
193 | }; | ||
194 | |||
195 | static int snmp6_seq_open(struct inode *inode, struct file *file) | 195 | static int snmp6_seq_open(struct inode *inode, struct file *file) |
196 | { | 196 | { |
197 | return single_open(file, snmp6_seq_show, PDE(inode)->data); | 197 | return single_open(file, snmp6_seq_show, PDE(inode)->data); |