diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 00:12:09 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 00:12:09 -0500 |
| commit | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (patch) | |
| tree | 41ace7a3e453b82776b9f2a1d3b670b6afe5aa59 /net/bridge/br_netfilter.c | |
| parent | 49430f97dd952eda60848bf6bf161b4917ba103d (diff) | |
| parent | e9bb4c9929a63b23dcc637fae312b36b038bdc61 (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/bridge/br_netfilter.c')
| -rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index b5018166b0e..c06cb098353 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -805,7 +805,7 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb, print_error: if (skb->dev != NULL) { printk("[%s]", skb->dev->name); - if (has_bridge_parent(skb->dev)) + if (bridge_parent(skb->dev)) printk("[%s]", bridge_parent(skb->dev)->name); } printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, |