Commit 025d89c2 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

bridge: Split may_deliver/deliver_clone out of br_flood



This patch moves the main loop body in br_flood into the function
may_deliver.  The code that clones an skb and delivers it is moved
into the deliver_clone function.

This allows this to be reused by the future multicast forward
function.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6088a539
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include <linux/err.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
...@@ -103,6 +104,44 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb) ...@@ -103,6 +104,44 @@ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb)
kfree_skb(skb); kfree_skb(skb);
} }
static int deliver_clone(struct net_bridge_port *prev, struct sk_buff *skb,
void (*__packet_hook)(const struct net_bridge_port *p,
struct sk_buff *skb))
{
skb = skb_clone(skb, GFP_ATOMIC);
if (!skb) {
struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
dev->stats.tx_dropped++;
return -ENOMEM;
}
__packet_hook(prev, skb);
return 0;
}
static struct net_bridge_port *maybe_deliver(
struct net_bridge_port *prev, struct net_bridge_port *p,
struct sk_buff *skb,
void (*__packet_hook)(const struct net_bridge_port *p,
struct sk_buff *skb))
{
int err;
if (!should_deliver(p, skb))
return prev;
if (!prev)
goto out;
err = deliver_clone(prev, skb, __packet_hook);
if (err)
return ERR_PTR(err);
out:
return p;
}
/* called under bridge lock */ /* called under bridge lock */
static void br_flood(struct net_bridge *br, struct sk_buff *skb, static void br_flood(struct net_bridge *br, struct sk_buff *skb,
struct sk_buff *skb0, struct sk_buff *skb0,
...@@ -111,38 +150,22 @@ static void br_flood(struct net_bridge *br, struct sk_buff *skb, ...@@ -111,38 +150,22 @@ static void br_flood(struct net_bridge *br, struct sk_buff *skb,
{ {
struct net_bridge_port *p; struct net_bridge_port *p;
struct net_bridge_port *prev; struct net_bridge_port *prev;
struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
prev = NULL; prev = NULL;
list_for_each_entry_rcu(p, &br->port_list, list) { list_for_each_entry_rcu(p, &br->port_list, list) {
if (should_deliver(p, skb)) { prev = maybe_deliver(prev, p, skb, __packet_hook);
if (prev != NULL) { if (IS_ERR(prev))
struct sk_buff *skb2; goto out;
if ((skb2 = skb_clone(skb, GFP_ATOMIC)) == NULL) {
dev->stats.tx_dropped++;
goto out;
}
__packet_hook(prev, skb2);
}
prev = p;
}
} }
if (!prev) if (!prev)
goto out; goto out;
if (skb0) { if (skb0)
skb = skb_clone(skb, GFP_ATOMIC); deliver_clone(prev, skb, __packet_hook);
if (!skb) { else
dev->stats.tx_dropped++; __packet_hook(prev, skb);
goto out;
}
}
__packet_hook(prev, skb);
return; return;
out: out:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment