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

net/bridge/br_forward.c

+4 −8
Original line number Diff line number Diff line
@@ -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,

	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)