diff options
author | Patrick McHardy <kaber@trash.net> | 2006-02-27 13:04:17 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-02-27 13:04:17 -0800 |
commit | bafac2a512bf4fd2ce7520f3976ce8aab4435f74 (patch) | |
tree | ff5c6538eeebceee2b3b5b137d6c66e8d28e77f1 /net/bridge | |
parent | 45fe4dc08cbf9510074b97a16606366c1d405f4d (diff) | |
download | kernel_samsung_smdk4412-bafac2a512bf4fd2ce7520f3976ce8aab4435f74.zip kernel_samsung_smdk4412-bafac2a512bf4fd2ce7520f3976ce8aab4435f74.tar.gz kernel_samsung_smdk4412-bafac2a512bf4fd2ce7520f3976ce8aab4435f74.tar.bz2 |
[NETFILTER]: Restore {ipt,ip6t,ebt}_LOG compatibility
The nfnetlink_log infrastructure changes broke compatiblity of the LOG
targets. They currently use whatever log backend was registered first,
which means that if ipt_ULOG was loaded first, no messages will be printed
to the ring buffer anymore.
Restore compatiblity by using the old log functions by default and only use
the nf_log backend if the user explicitly said so.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebt_log.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index 0128fbb..288ff1d 100644 --- a/net/bridge/netfilter/ebt_log.c +++ b/net/bridge/netfilter/ebt_log.c @@ -166,7 +166,12 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr, li.u.log.level = info->loglevel; li.u.log.logflags = info->bitmask; - nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, info->prefix); + if (info->bitmask & EBT_LOG_NFLOG) + nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, + info->prefix); + else + ebt_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, + info->prefix); } static struct ebt_watcher log = |