aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-05-25 15:58:54 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-17 21:26:10 -0700
commit9ef513bed68534110727381ab652f06756803f5a (patch)
treed4981dbce1d613c68d022ed3509eb3bf41c7c4fb
parentbc0e646796928918e45b6465e02616f2fe65c3c1 (diff)
downloadkernel_samsung_tuna-9ef513bed68534110727381ab652f06756803f5a.zip
kernel_samsung_tuna-9ef513bed68534110727381ab652f06756803f5a.tar.gz
kernel_samsung_tuna-9ef513bed68534110727381ab652f06756803f5a.tar.bz2
[BRIDGE]: optimize conditional in forward path
Small optimizations of bridge forwarding path. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bridge/br_forward.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 56f3aa4..0dca027 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -20,14 +20,11 @@
#include <linux/netfilter_bridge.h>
#include "br_private.h"
+/* Don't forward packets to originating port or forwarding diasabled */
static inline int should_deliver(const struct net_bridge_port *p,
const struct sk_buff *skb)
{
- if (skb->dev == p->dev ||
- p->state != BR_STATE_FORWARDING)
- return 0;
-
- return 1;
+ return (skb->dev != p->dev && p->state == BR_STATE_FORWARDING);
}
static inline unsigned packet_length(const struct sk_buff *skb)
@@ -55,10 +52,9 @@ int br_dev_queue_push_xmit(struct sk_buff *skb)
int br_forward_finish(struct sk_buff *skb)
{
- NF_HOOK(PF_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
- br_dev_queue_push_xmit);
+ return NF_HOOK(PF_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
+ br_dev_queue_push_xmit);
- return 0;
}
static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb)