summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>2016-07-14 06:09:59 +0300
committerDavid S. Miller <davem@davemloft.net>2016-07-17 05:57:37 +0300
commit46c0772d85306f2edec03c8fa40a6efa6af915bc (patch)
tree3ab3160e9bd2a00720fb418731456e9be70b57cf /net/bridge
parentc380d37e97e783e36a924279fbd2f6837508546a (diff)
downloadlinux-46c0772d85306f2edec03c8fa40a6efa6af915bc.tar.xz
net: bridge: minor style adjustments in br_handle_frame_finish
Trivial style changes in br_handle_frame_finish. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_input.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index a7817e6f306f..0b6d32619468 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -131,11 +131,11 @@ static void br_do_proxy_arp(struct sk_buff *skb, struct net_bridge *br,
/* note: already called with rcu_read_lock */
int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{
- const unsigned char *dest = eth_hdr(skb)->h_dest;
struct net_bridge_port *p = br_port_get_rcu(skb->dev);
- struct net_bridge *br;
- struct net_bridge_fdb_entry *dst;
+ const unsigned char *dest = eth_hdr(skb)->h_dest;
+ struct net_bridge_fdb_entry *dst = NULL;
struct net_bridge_mdb_entry *mdst;
+ struct net_bridge *br;
struct sk_buff *skb2;
bool unicast = true;
u16 vid = 0;
@@ -166,8 +166,6 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
if (br->dev->flags & IFF_PROMISC)
skb2 = skb;
- dst = NULL;
-
if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
br_do_proxy_arp(skb, br, vid, p);
@@ -185,13 +183,12 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
skb = NULL;
if (!skb2)
goto out;
- } else
+ } else {
skb2 = skb;
-
+ }
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. */
skb = NULL;
@@ -201,8 +198,9 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
if (dst) {
dst->used = jiffies;
br_forward(dst->dst, skb, skb2);
- } else
+ } else {
br_flood_forward(br, skb, skb2, unicast);
+ }
}
if (skb2)