diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-29 19:00:11 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-29 19:00:11 +0000 |
| commit | 1fd25d40bf5c918262d5b9904386a01676da35e4 (patch) | |
| tree | 47dd8f6f87c3e8a60c526c4b2988656b46a7e193 /br-nf-bds | |
| parent | b09e04bf343f1aae0cab4840e5594de59c80ef7b (diff) | |
*** empty log message ***
Diffstat (limited to 'br-nf-bds')
| -rw-r--r-- | br-nf-bds/linux/net/bridge/br_input.c | 6 | ||||
| -rw-r--r-- | br-nf-bds/linux2.5/net/bridge/br_input.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/br-nf-bds/linux/net/bridge/br_input.c b/br-nf-bds/linux/net/bridge/br_input.c index 6d9f5c0..9365f9e 100644 --- a/br-nf-bds/linux/net/bridge/br_input.c +++ b/br-nf-bds/linux/net/bridge/br_input.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek <buytenh@gnu.org> * - * $Id: br_input.c,v 1.4 2002/09/17 21:44:59 bdschuym Exp $ + * $Id: br_input.c,v 1.5 2002/09/29 19:00:11 bdschuym Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -149,8 +149,10 @@ int br_handle_frame(struct sk_buff *skb) goto handle_special_frame; if (p->state == BR_STATE_FORWARDING) { - if (br_should_route_hook && br_should_route_hook(&skb)) + if (br_should_route_hook && br_should_route_hook(&skb)) { + read_unlock(&br->lock); return -1; + } NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, br_handle_frame_finish); diff --git a/br-nf-bds/linux2.5/net/bridge/br_input.c b/br-nf-bds/linux2.5/net/bridge/br_input.c index 2f15eb6..7ad9a24 100644 --- a/br-nf-bds/linux2.5/net/bridge/br_input.c +++ b/br-nf-bds/linux2.5/net/bridge/br_input.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek <buytenh@gnu.org> * - * $Id: br_input.c,v 1.3 2002/09/18 18:26:47 bdschuym Exp $ + * $Id: br_input.c,v 1.4 2002/09/29 19:01:05 bdschuym Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -149,8 +149,10 @@ int br_handle_frame(struct sk_buff *skb) goto handle_special_frame; if (p->state == BR_STATE_FORWARDING) { - if (br_should_route_hook && br_should_route_hook(&skb)) + if (br_should_route_hook && br_should_route_hook(&skb)) { + read_unlock(&br->lock); return -1; + } NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL, br_handle_frame_finish); |