patch-2.4.21 linux-2.4.21/net/ipv4/netfilter/ipfwadm_core.c
Next file: linux-2.4.21/net/ipv4/netfilter/ipt_ECN.c
Previous file: linux-2.4.21/net/ipv4/netfilter/ipchains_core.c
Back to the patch index
Back to the overall index
- Lines: 106
- Date:
2003-06-13 07:51:39.000000000 -0700
- Orig file:
linux-2.4.20/net/ipv4/netfilter/ipfwadm_core.c
- Orig date:
2002-02-25 11:38:14.000000000 -0800
diff -urN linux-2.4.20/net/ipv4/netfilter/ipfwadm_core.c linux-2.4.21/net/ipv4/netfilter/ipfwadm_core.c
@@ -1104,9 +1104,8 @@
#endif /* CONFIG_IP_FIREWALL */
#if defined(CONFIG_IP_FIREWALL) || defined(CONFIG_IP_ACCT)
-
static int ip_chain_procinfo(int stage, char *buffer, char **start,
- off_t offset, int length, int reset)
+ off_t offset, int length)
{
off_t pos=0, begin=0;
struct ip_fw *i;
@@ -1177,12 +1176,6 @@
len = last_len;
break;
}
- else if(reset)
- {
- /* This needs to be done at this specific place! */
- i->fw_pcnt=0L;
- i->fw_bcnt=0L;
- }
last_len = len;
i=i->fw_next;
}
@@ -1196,69 +1189,30 @@
#endif
#ifdef CONFIG_IP_ACCT
-
static int ip_acct_procinfo(char *buffer, char **start, off_t offset,
- int length
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,29)
- , int reset
-#endif
- )
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,29)
- /* FIXME: No more `atomic' read and reset. Wonderful 8-( --RR */
- int reset = 0;
-#endif
- return ip_chain_procinfo(IP_FW_ACCT, buffer,start, offset,length,
- reset);
+ int length)
+{
+ return ip_chain_procinfo(IP_FW_ACCT, buffer,start, offset,length);
}
-
#endif
#ifdef CONFIG_IP_FIREWALL
-
static int ip_fw_in_procinfo(char *buffer, char **start, off_t offset,
- int length
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,29)
- , int reset
-#endif
- )
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,29)
- /* FIXME: No more `atomic' read and reset. Wonderful 8-( --RR */
- int reset = 0;
-#endif
- return ip_chain_procinfo(IP_FW_IN, buffer,start,offset,length,
- reset);
+ int length)
+{
+ return ip_chain_procinfo(IP_FW_IN, buffer,start,offset,length);
}
static int ip_fw_out_procinfo(char *buffer, char **start, off_t offset,
- int length
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,29)
- , int reset
-#endif
- )
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,29)
- /* FIXME: No more `atomic' read and reset. Wonderful 8-( --RR */
- int reset = 0;
-#endif
- return ip_chain_procinfo(IP_FW_OUT, buffer,start,offset,length,
- reset);
+ int length)
+{
+ return ip_chain_procinfo(IP_FW_OUT, buffer,start,offset,length);
}
static int ip_fw_fwd_procinfo(char *buffer, char **start, off_t offset,
- int length
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,29)
- , int reset
-#endif
- )
-{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,29)
- /* FIXME: No more `atomic' read and reset. Wonderful 8-( --RR */
- int reset = 0;
-#endif
- return ip_chain_procinfo(IP_FW_FWD, buffer,start,offset,length,
- reset);
+ int length)
+{
+ return ip_chain_procinfo(IP_FW_FWD, buffer,start,offset,length);
}
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)