* [PATCH 1/2] make nf_log compile with PROC_FS == n
@ 2005-08-11 7:12 Harald Welte
2005-08-11 22:31 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Harald Welte @ 2005-08-11 7:12 UTC (permalink / raw)
To: David Miller; +Cc: Linux Netdev List, Netfilter Development Mailinglist
[-- Attachment #1.1: Type: text/plain, Size: 337 bytes --]
Hi Dave, please apply!
--
- Harald Welte <laforge@gnumonks.org> http://gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)
[-- Attachment #1.2: 42-nflog_no_procfs.patch --]
[-- Type: text/plain, Size: 526 bytes --]
[NETFILTER] Fix compilation when no PROC_FS enabled
Signed-off-by: Harald Welte <laforge@netfilter.org>
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -166,12 +166,12 @@ int __init netfilter_log_init(void)
{
#ifdef CONFIG_PROC_FS
struct proc_dir_entry *pde;
+
pde = create_proc_entry("nf_log", S_IRUGO, proc_net_netfilter);
-#endif
if (!pde)
return -1;
pde->proc_fops = &nflog_file_ops;
-
+#endif
return 0;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] make nf_log compile with PROC_FS == n
2005-08-11 7:12 [PATCH 1/2] make nf_log compile with PROC_FS == n Harald Welte
@ 2005-08-11 22:31 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2005-08-11 22:31 UTC (permalink / raw)
To: laforge; +Cc: netdev, netfilter-devel
From: Harald Welte <laforge@gnumonks.org>
Date: Thu, 11 Aug 2005 09:12:43 +0200
> [NETFILTER] Fix compilation when no PROC_FS enabled
>
> Signed-off-by: Harald Welte <laforge@netfilter.org>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-08-11 22:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-11 7:12 [PATCH 1/2] make nf_log compile with PROC_FS == n Harald Welte
2005-08-11 22:31 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).