diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-02-13 15:43:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-02-13 15:43:58 -0800 |
| commit | 178a3259f2508e786fb1bd6538365a167cee35c1 (patch) | |
| tree | 3736fd620ecdec6193b52505982e8fa12698c695 /net/bridge | |
| parent | a6c1cd572642478528165ac44db4d2daae125a21 (diff) | |
| download | op-kernel-dev-178a3259f2508e786fb1bd6538365a167cee35c1.zip op-kernel-dev-178a3259f2508e786fb1bd6538365a167cee35c1.tar.gz | |
[BRIDGE]: Better fix for netfilter missing symbol has_bridge_parent
Horms patch was the best of the three fixes. Dave, already applied
Harald's version, so this patch converts that to the better one.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index c06cb09..6bb0c7e 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -805,8 +805,8 @@ 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 (bridge_parent(skb->dev)) - printk("[%s]", bridge_parent(skb->dev)->name); + if (realoutdev) + printk("[%s]", realoutdev->name); } printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw, skb->data); |
