dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

bridge: Allow tail-call on br_pass_frame_up 

This patch allows tail-call on the call to br_pass_frame_up
in br_handle_frame_finish.  This is now possible because of the
previous patch to call br_pass_frame_up last.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2010-02-27 19:41:40 +00:00 committed by David S. Miller
parent 87557c18ac
commit 68b7c895be
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/bridge/br_input.c
View File

@ -20,9 +20,9 @@
/* Bridge group multicast address 802.1d (pg 51). */
const u8 br_group_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
static int br_pass_frame_up(struct sk_buff *skb)
{
struct net_device *indev, *brdev = br->dev;
struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
brdev->stats.rx_packets++;
brdev->stats.rx_bytes += skb->len;
@ -30,8 +30,8 @@ static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
indev = skb->dev;
skb->dev = brdev;
NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
netif_receive_skb);
return NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
netif_receive_skb);
}
/* note: already called with rcu_read_lock (preempt_disabled) */
@ -53,6 +53,8 @@ int br_handle_frame_finish(struct sk_buff *skb)
if (p->state == BR_STATE_LEARNING)
goto drop;
BR_INPUT_SKB_CB(skb)->brdev = br->dev;
/* The packet skb2 goes to the local host (NULL to skip). */
skb2 = NULL;
@ -81,7 +83,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
}
if (skb2)
br_pass_frame_up(br, skb2);
return br_pass_frame_up(skb2);
out:
return 0;

6
net/bridge/br_private.h
View File

@ -131,6 +131,12 @@ struct net_bridge
struct kobject *ifobj;
};
struct br_input_skb_cb {
struct net_device *brdev;
};
#define BR_INPUT_SKB_CB(__skb) ((struct br_input_skb_cb *)(__skb)->cb)
extern struct notifier_block br_device_notifier;
extern const u8 br_group_address[ETH_ALEN];