diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-27 15:05:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-27 15:05:47 -0400 |
| commit | 29453f65a4d0a46190dedf93ab31717d4c26bda6 (patch) | |
| tree | 872042a7a8fcf36b72de40140d7552aa03b3ca0a /net | |
| parent | a0babc80eb375aad69dab4687c3b44c47d42f241 (diff) | |
| parent | 8b267b312df9343fea3bd679c509b36214b5a854 (diff) | |
| download | linux-3.10-29453f65a4d0a46190dedf93ab31717d4c26bda6.tar.gz linux-3.10-29453f65a4d0a46190dedf93ab31717d4c26bda6.tar.bz2 linux-3.10-29453f65a4d0a46190dedf93ab31717d4c26bda6.zip | |
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 3e2f91ffa4e..05dd35114a2 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -565,7 +565,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) struct orig_node *orig_node = NULL; int data_len = skb->len, ret; short vid = -1; - bool do_bcast = false; + bool do_bcast; if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE) goto dropped; @@ -598,15 +598,15 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) tt_local_add(soft_iface, ethhdr->h_source); orig_node = transtable_search(bat_priv, ethhdr->h_dest); - if (is_multicast_ether_addr(ethhdr->h_dest) || - (orig_node && orig_node->gw_flags)) { + do_bcast = is_multicast_ether_addr(ethhdr->h_dest); + if (do_bcast || (orig_node && orig_node->gw_flags)) { ret = gw_is_target(bat_priv, skb, orig_node); if (ret < 0) goto dropped; - if (ret == 0) - do_bcast = true; + if (ret) + do_bcast = false; } /* ethernet packet should be broadcasted */ |