[PATCH 2.4] netfilter: get rid of warnings if no PROC_FS

[PATCH 2.4] netfilter: get rid of warnings if no PROC_FS

[Harald Welte]

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

Hi Dave!

This mail contains the fifth netfilter patch, please apply.

Author: Stephen Hemminger

Trivial -- Get rid of warnings in netfilter if /proc is not configured on.
Patch against 2.6.0-test1

diff -Nru a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
--- a/net/ipv4/netfilter/ipt_recent.c	Fri Jul 25 12:30:29 2003
+++ b/net/ipv4/netfilter/ipt_recent.c	Fri Jul 25 12:30:29 2003
@@ -91,8 +91,10 @@
  */
 static spinlock_t recent_lock = SPIN_LOCK_UNLOCKED;
 
+#ifdef CONFIG_PROC_FS
 /* Our /proc/net/ipt_recent entry */
 static struct proc_dir_entry *proc_net_ipt_recent = NULL;
+#endif
 
 /* Function declaration for later. */
 static int
@@ -959,8 +961,10 @@
 	int count;
 
 	printk(version);
+#ifdef CONFIG_PROC_FS
 	proc_net_ipt_recent = proc_mkdir("ipt_recent",proc_net);
 	if(!proc_net_ipt_recent) return -ENOMEM;
+#endif
 
 	if(ip_list_hash_size && ip_list_hash_size <= ip_list_tot) {
 	  printk(KERN_WARNING RECENT_NAME ": ip_list_hash_size too small, resetting to default.\n");

-- 
- Harald Welte <laforge@netfilter.org>             http://www.netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2.4] netfilter: get rid of warnings if no PROC_FS

[David S. Miller]

On Sun, 30 Nov 2003 21:05:12 +0530
Harald Welte <laforge@netfilter.org> wrote:

> This mail contains the fifth netfilter patch, please apply.
> 
> Author: Stephen Hemminger
> 
> Trivial -- Get rid of warnings in netfilter if /proc is not configured on.

Applied, thanks.