diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-03-20 22:57:18 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-20 22:57:18 -0800 |
| commit | d5513a7d32de721a9e396c2b32cf277d5cef5fb6 (patch) | |
| tree | aecdea676fae6ef1390ac4f6e63a6196db2ebf79 /net | |
| parent | cee4854122d4347b2f6f10fe7f007a48fada29a0 (diff) | |
| download | op-kernel-dev-d5513a7d32de721a9e396c2b32cf277d5cef5fb6.zip op-kernel-dev-d5513a7d32de721a9e396c2b32cf277d5cef5fb6.tar.gz | |
[BRIDGE]: optimize frame pass up
The netfilter hook that is used to receive frames doesn't need to be a
stub. It is only called in two ways, both of which ignore the return
value.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_input.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 4eef837..6e22372 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -21,12 +21,6 @@ const unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; -static int br_pass_frame_up_finish(struct sk_buff *skb) -{ - netif_receive_skb(skb); - return 0; -} - static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb) { struct net_device *indev; @@ -38,7 +32,7 @@ static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb) skb->dev = br->dev; NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, - br_pass_frame_up_finish); + netif_receive_skb); } /* note: already called with rcu_read_lock (preempt_disabled) */ |
