From: Patrick McHardy <kaber@trash.net>
To: Marcus Sundberg <marcus@ingate.com>
Cc: Harald Welte <laforge@netfilter.org>,
netfilter-devel@lists.netfilter.org
Subject: Re: [PATCH] ctnetlink: Make expect events work
Date: Thu, 12 Jan 2006 22:03:20 +0100 [thread overview]
Message-ID: <43C6C418.6060104@trash.net> (raw)
In-Reply-To: <43C6A946.5070009@ingate.com>
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
Marcus Sundberg wrote:
> [NETFILTER] ctnetlink: Make expect events work
>
> The ctnetlink expectation events should use the NFNL_SUBSYS_CTNETLINK_EXP
> subsystem, not NFNL_SUBSYS_CTNETLINK.
Thanks, applied with the same change in nfnetlink_conntrack.
For future patches please also check if bugs are present in
nfnetlink_conntrack.
[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1678 bytes --]
[NETFILTER]: ctnetlink: Fix subsystem used for expectation events
The ctnetlink expectation events should use the NFNL_SUBSYS_CTNETLINK_EXP
subsystem, not NFNL_SUBSYS_CTNETLINK.
Signed-off-by: Marcus Sundberg <marcus@ingate.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 078ff587a861c7d2499990ca46766c030bae5ecc
tree 0064472eb1373f544ac136d3cd35194b6493a437
parent d98b092ef1a291d2fd31cbf1152bd16cca2e925d
author Marcus Sundberg <marcus@ingate.com> Thu, 12 Jan 2006 22:00:52 +0100
committer Patrick McHardy <kaber@trash.net> Thu, 12 Jan 2006 22:00:52 +0100
net/ipv4/netfilter/ip_conntrack_netlink.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index c9ebbe0..b62518b 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -1216,7 +1216,7 @@ static int ctnetlink_expect_event(struct
b = skb->tail;
- type |= NFNL_SUBSYS_CTNETLINK << 8;
+ type |= NFNL_SUBSYS_CTNETLINK_EXP << 8;
nlh = NLMSG_PUT(skb, 0, 0, type, sizeof(struct nfgenmsg));
nfmsg = NLMSG_DATA(nlh);
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 73ab16b..e98d00c 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1232,7 +1232,7 @@ static int ctnetlink_expect_event(struct
b = skb->tail;
- type |= NFNL_SUBSYS_CTNETLINK << 8;
+ type |= NFNL_SUBSYS_CTNETLINK_EXP << 8;
nlh = NLMSG_PUT(skb, 0, 0, type, sizeof(struct nfgenmsg));
nfmsg = NLMSG_DATA(nlh);
next prev parent reply other threads:[~2006-01-12 21:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-12 19:08 [PATCH] ctnetlink: Make expect events work Marcus Sundberg
2006-01-12 21:03 ` Patrick McHardy [this message]
2006-01-12 21:11 ` Marcus Sundberg
2006-01-13 0:20 ` Pablo Neira Ayuso
2006-01-13 10:54 ` Marcus Sundberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43C6C418.6060104@trash.net \
--to=kaber@trash.net \
--cc=laforge@netfilter.org \
--cc=marcus@ingate.com \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.