Commit 9ef513be authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[BRIDGE]: optimize conditional in forward path



Small optimizations of bridge forwarding path.
Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc0e6467
...@@ -20,14 +20,11 @@ ...@@ -20,14 +20,11 @@
#include <linux/netfilter_bridge.h> #include <linux/netfilter_bridge.h>
#include "br_private.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, static inline int should_deliver(const struct net_bridge_port *p,
const struct sk_buff *skb) const struct sk_buff *skb)
{ {
if (skb->dev == p->dev || return (skb->dev != p->dev && p->state == BR_STATE_FORWARDING);
p->state != BR_STATE_FORWARDING)
return 0;
return 1;
} }
static inline unsigned packet_length(const struct sk_buff *skb) static inline unsigned packet_length(const struct sk_buff *skb)
...@@ -55,10 +52,9 @@ int br_dev_queue_push_xmit(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) int br_forward_finish(struct sk_buff *skb)
{ {
NF_HOOK(PF_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev, return NF_HOOK(PF_BRIDGE, NF_BR_POST_ROUTING, skb, NULL, skb->dev,
br_dev_queue_push_xmit); br_dev_queue_push_xmit);
return 0;
} }
static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb) static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment