sparc64: Don't MAGIC_SYSRQ ifdef smp_fetch_global_regs and support code.

[linux-2.6] / net / ipv4 / proc.c

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index daf5d3c80cef9d5ec8ffa231d8ed2f578f430753..8f5a403f6f6b9487b62eec845664d960c056bc8c 100644 (file)
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -74,20 +74,12 @@ static int sockstat_seq_open(struct inode *inode, struct file *file)
        return single_open_net(inode, file, sockstat_seq_show);
 }
 
-static int sockstat_seq_release(struct inode *inode, struct file *file)
-{
-       struct net *net = ((struct seq_file *)file->private_data)->private;
-
-       put_net(net);
-       return single_release(inode, file);
-}
-
 static const struct file_operations sockstat_seq_fops = {
        .owner   = THIS_MODULE,
        .open    = sockstat_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = sockstat_seq_release,
+       .release = single_release_net,
 };
 
 /* snmp items */
@@ -240,6 +232,8 @@ static const struct snmp_mib snmp4_net_list[] = {
        SNMP_MIB_ITEM("TCPDSACKIgnoredOld", LINUX_MIB_TCPDSACKIGNOREDOLD),
        SNMP_MIB_ITEM("TCPDSACKIgnoredNoUndo", LINUX_MIB_TCPDSACKIGNOREDNOUNDO),
        SNMP_MIB_ITEM("TCPSpuriousRTOs", LINUX_MIB_TCPSPURIOUSRTOS),
+       SNMP_MIB_ITEM("TCPMD5NotFound", LINUX_MIB_TCPMD5NOTFOUND),
+       SNMP_MIB_ITEM("TCPMD5Unexpected", LINUX_MIB_TCPMD5UNEXPECTED),
        SNMP_MIB_SENTINEL
 };
 
@@ -383,20 +377,12 @@ static int snmp_seq_open(struct inode *inode, struct file *file)
        return single_open_net(inode, file, snmp_seq_show);
 }
 
-static int snmp_seq_release(struct inode *inode, struct file *file)
-{
-       struct net *net = ((struct seq_file *)file->private_data)->private;
-
-       put_net(net);
-       return single_release(inode, file);
-}
-
 static const struct file_operations snmp_seq_fops = {
        .owner   = THIS_MODULE,
        .open    = snmp_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = snmp_seq_release,
+       .release = single_release_net,
 };
 
 
@@ -438,20 +424,12 @@ static int netstat_seq_open(struct inode *inode, struct file *file)
        return single_open_net(inode, file, netstat_seq_show);
 }
 
-static int netstat_seq_release(struct inode *inode, struct file *file)
-{
-       struct net *net = ((struct seq_file *)file->private_data)->private;
-
-       put_net(net);
-       return single_release(inode, file);
-}
-
 static const struct file_operations netstat_seq_fops = {
        .owner   = THIS_MODULE,
        .open    = netstat_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = netstat_seq_release,
+       .release = single_release_net,
 };
 
 static __net_init int ip_proc_init_net(struct net *net)