: Netfilter fixes
Subsystems (2)
cover : Netfilter fixes
Hi Dave,
following are two more netfilter fixes for 2.6.20, fixing H.323 compilation with IPV6=m and NF_CONNTRACK_H323=y (Adrian's patch) and another compile failure with NF_CONNTRACK_MARK=n (same for IP_NF_CONNTRACK_MARK=n).
Please apply, thanks.
net/ipv4/netfilter/ip_conntrack_netlink.c | 2 ++ net/netfilter/Kconfig | 2 +- net/netfilter/nf_conntrack_netlink.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-)
Adrian Bunk:
[NETFILTER]: nf_conntrack_h323: fix compile error with CONFIG_IPV6=m, CONFIG_NF_CONNTRACK_H323=y
Max Kellermann:
[NETFILTER]: ctnetlink: fix compile failure with NF_CONNTRACK_MARK=n
PATCH 1/2 : ctnetlink: fix compile failure with NF_CONNTRACK_MARK=n
[NETFILTER]: ctnetlink: fix compile failure with NF_CONNTRACK_MARK=n
CC net/netfilter/nf_conntrack_netlink.onet/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event':net/netfilter/nf_conntrack_netlink.c:392: error: 'struct nf_conn' has no member named 'mark' make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1
---
commit de4fee1de939b8a5422020822195dea4b25e142b
tree 0d8bdc11e791cec75d5c61ecdbdd9d26f80df9ea
parent 91ddce838eb24a62844bdfc1aaca0a364343ad02
author Max Kellermann <[email protected]> Fri, 02 Feb 2007 14:09:40 +0100 committer Patrick McHardy <[email protected]> Fri, 02 Feb 2007 14:09:40 +0100
net/ipv4/netfilter/ip_conntrack_netlink.c | 2 ++ net/netfilter/nf_conntrack_netlink.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
net/ipv4/netfilter/ip_conntrack_netlink.c +2 -0
@@ -374,9 +374,11 @@ static int ctnetlink_conntrack_event(str && ctnetlink_dump_helpinfo(skb, ct) < 0) goto nfattr_failure; +#ifdef CONFIG_IP_NF_CONNTRACK_MARK if ((events &IPCT_MARK || ct->mark) &&ctnetlink_dump_mark (skb, ct) <0 ) goto nfattr_failure; +#endif if (events & IPCT_COUNTER_FILLING && (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||
net/netfilter/nf_conntrack_netlink.c +2 -0
@@ -389,9 +389,11 @@ static int ctnetlink_conntrack_event(str && ctnetlink_dump_helpinfo(skb, ct) < 0) goto nfattr_failure; +#ifdef CONFIG_NF_CONNTRACK_MARK if ((events &IPCT_MARK || ct->mark) &&ctnetlink_dump_mark (skb, ct) <0 ) goto nfattr_failure; +#endif if (events & IPCT_COUNTER_FILLING && (ctnetlink_dump_counters(skb, ct, IP_CT_DIR_ORIGINAL) < 0 ||
PATCH 2/2 : nf_conntrack_h323: fix compile error with CONFIG_IPV6=m, CONFIG_NF_CONNTRACK_H323=y
In reply to Patrick McHardy[NETFILTER]: nf_conntrack_h323: fix compile error with CONFIG_IPV6=m, CONFIG_NF_CONNTRACK_H323=y
Fix this by letting NF_CONNTRACK_H323 depend on (IPV6 || IPV6=n).
---
commit c204236dae38644133e5713d59d81e3e0abac384
tree eda435df6adf784f5778c988e4cffe5ce328673e
parent de4fee1de939b8a5422020822195dea4b25e142b
author Adrian Bunk <[email protected]> Sat, 03 Feb 2007 02:28:44 +0100 committer Patrick McHardy <[email protected]> Sat, 03 Feb 2007 02:28:44 +0100
net/netfilter/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/netfilter/Kconfig +1 -1
@@ -165,7 +165,7 @@ config NF_CONNTRACK_FTP config NF_CONNTRACK_H323 tristate "H.323 protocol support (EXPERIMENTAL)" - depends on EXPERIMENTAL && NF_CONNTRACK + depends on EXPERIMENTAL && NF_CONNTRACK && (IPV6 || IPV6=n) help H.323 is a VoIP signalling protocol from ITU-T. As one of the most important VoIP protocols, it is widely used by voice hardware and
From: Patrick McHardy <[email protected]>
Date: Sat, 3 Feb 2007 02:46:22 +0100 (MET)
Quoted 7 lines
Hi Dave,
following are two more netfilter fixes for 2.6.20, fixing H.323 compilation with IPV6=m and NF_CONNTRACK_H323=y (Adrian's patch) and another compile failure with NF_CONNTRACK_MARK=n (same for IP_NF_CONNTRACK_MARK=n).
Please apply, thanks.
Applied, thanks Patrick.