summaryrefslogtreecommitdiffstats
path: root/br-nf-bds/linux2.5/net/ipv4/netfilter/ipt_LOG.c
diff options
context:
space:
mode:
authorBart De Schuymer <bdschuym@pandora.be>2002-10-19 14:29:53 +0000
committerBart De Schuymer <bdschuym@pandora.be>2002-10-19 14:29:53 +0000
commit435b14632a66d54f1aee4602b26f365b58aec518 (patch)
treedeb57a4c54fbae66356e0475166ba599f00a78a8 /br-nf-bds/linux2.5/net/ipv4/netfilter/ipt_LOG.c
parentc402ff5bbfe31c66bfe3a0910e03b103c2181510 (diff)
update to use nf_bridge
Diffstat (limited to 'br-nf-bds/linux2.5/net/ipv4/netfilter/ipt_LOG.c')
-rw-r--r--br-nf-bds/linux2.5/net/ipv4/netfilter/ipt_LOG.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/br-nf-bds/linux2.5/net/ipv4/netfilter/ipt_LOG.c b/br-nf-bds/linux2.5/net/ipv4/netfilter/ipt_LOG.c
index 48bb12f..07bc0e4 100644
--- a/br-nf-bds/linux2.5/net/ipv4/netfilter/ipt_LOG.c
+++ b/br-nf-bds/linux2.5/net/ipv4/netfilter/ipt_LOG.c
@@ -286,11 +286,16 @@ ipt_log_target(struct sk_buff **pskb,
spin_lock_bh(&log_lock);
printk(level_string);
printk("%sIN=%s ", loginfo->prefix, in ? in->name : "");
- if ((*pskb)->physindev && in != (*pskb)->physindev)
- printk("PHYSIN=%s ", (*pskb)->physindev->name);
- printk("OUT=%s ", out ? out->name : "");
- if ((*pskb)->physoutdev && out != (*pskb)->physoutdev)
- printk("PHYSOUT=%s ", (*pskb)->physoutdev->name);
+ if ((*pskb)->nf_bridge) {
+ struct net_device *physindev = (*pskb)->nf_bridge->physindev;
+ struct net_device *physoutdev = (*pskb)->nf_bridge->physoutdev;
+
+ if (physindev && in != physindev)
+ printk("PHYSIN=%s ", physindev->name);
+ printk("OUT=%s ", out ? out->name : "");
+ if (physoutdev && out != physoutdev)
+ printk("PHYSOUT=%s ", physoutdev->name);
+ }
if (in && !out) {
/* MAC logging for input chain only. */