From 09801fcee56c37cc341fa547cfd9b918a674e4c0 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 20 Mar 2006 22:57:18 -0800 Subject: [PATCH] --- yaml --- r: 22317 b: refs/heads/master c: d5513a7d32de721a9e396c2b32cf277d5cef5fb6 h: refs/heads/master i: 22315: c38645f02afceef8f5cc99b5bea7be8a506b654f v: v3 --- [refs] | 2 +- trunk/net/bridge/br_input.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 26cb4b8d89d3..9288207d53d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cee4854122d4347b2f6f10fe7f007a48fada29a0 +refs/heads/master: d5513a7d32de721a9e396c2b32cf277d5cef5fb6 diff --git a/trunk/net/bridge/br_input.c b/trunk/net/bridge/br_input.c index 4eef83755315..6e223723cc8d 100644 --- a/trunk/net/bridge/br_input.c +++ b/trunk/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) */