diff options
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 4eef83755315..6e223723cc8d 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c | |||
@@ -21,12 +21,6 @@ | |||
21 | 21 | ||
22 | const unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; | 22 | const unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; |
23 | 23 | ||
24 | static int br_pass_frame_up_finish(struct sk_buff *skb) | ||
25 | { | ||
26 | netif_receive_skb(skb); | ||
27 | return 0; | ||
28 | } | ||
29 | |||
30 | static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb) | 24 | static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb) |
31 | { | 25 | { |
32 | struct net_device *indev; | 26 | struct net_device *indev; |
@@ -38,7 +32,7 @@ static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb) | |||
38 | skb->dev = br->dev; | 32 | skb->dev = br->dev; |
39 | 33 | ||
40 | NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, | 34 | NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL, |
41 | br_pass_frame_up_finish); | 35 | netif_receive_skb); |
42 | } | 36 | } |
43 | 37 | ||
44 | /* note: already called with rcu_read_lock (preempt_disabled) */ | 38 | /* note: already called with rcu_read_lock (preempt_disabled) */ |