openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: bridge: rearrange flood vs unicast receive paths 

This patch removes one conditional from the unicast path by using the fact
that skb is NULL only when the packet is multicast or is local.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2016-07-14 06:10:00 +03:00 committed by David S. Miller
parent 46c0772d85
commit e151aab9b5
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/bridge/br_input.c
View File

@ -134,10 +134,10 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
struct net_bridge_port *p = br_port_get_rcu(skb->dev); struct net_bridge_port *p = br_port_get_rcu(skb->dev);
const unsigned char *dest = eth_hdr(skb)->h_dest; const unsigned char *dest = eth_hdr(skb)->h_dest;
struct net_bridge_fdb_entry *dst = NULL; struct net_bridge_fdb_entry *dst = NULL;
bool mcast_hit = false, unicast = true;
struct net_bridge_mdb_entry *mdst; struct net_bridge_mdb_entry *mdst;
struct net_bridge *br; struct net_bridge *br;
struct sk_buff *skb2; struct sk_buff *skb2;
bool unicast = true;
u16 vid = 0; u16 vid = 0;
if (!p || p->state == BR_STATE_DISABLED) if (!p || p->state == BR_STATE_DISABLED)
@ -177,30 +177,29 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) && if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&
br_multicast_querier_exists(br, eth_hdr(skb))) { br_multicast_querier_exists(br, eth_hdr(skb))) {
if ((mdst && mdst->mglist) || if ((mdst && mdst->mglist) ||
br_multicast_is_router(br)) br_multicast_is_router(br)) {
skb2 = skb; skb2 = skb;
br_multicast_forward(mdst, skb, skb2); br->dev->stats.multicast++;
skb = NULL; }
if (!skb2) mcast_hit = true;
goto out;
} else { } else {
skb2 = skb; skb2 = skb;
br->dev->stats.multicast++;
} }
unicast = false; unicast = false;
br->dev->stats.multicast++;
} else if ((dst = __br_fdb_get(br, dest, vid)) && dst->is_local) { } else if ((dst = __br_fdb_get(br, dest, vid)) && dst->is_local) {
skb2 = skb;
/* Do not forward the packet since it's local. */ /* Do not forward the packet since it's local. */
skb = NULL; return br_pass_frame_up(skb);
} }
if (skb) { if (dst) {
if (dst) { dst->used = jiffies;
dst->used = jiffies; br_forward(dst->dst, skb, skb2);
br_forward(dst->dst, skb, skb2); } else {
} else { if (!mcast_hit)
br_flood_forward(br, skb, skb2, unicast); br_flood_forward(br, skb, skb2, unicast);
} else
br_multicast_forward(mdst, skb, skb2);
} }
if (skb2) if (skb2)