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 | |
parent | a0babc80eb375aad69dab4687c3b44c47d42f241 (diff) | |
parent | 8b267b312df9343fea3bd679c509b36214b5a854 (diff) |
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
-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 3e2f91ffa4e2..05dd35114a27 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) | |||
565 | struct orig_node *orig_node = NULL; | 565 | struct orig_node *orig_node = NULL; |
566 | int data_len = skb->len, ret; | 566 | int data_len = skb->len, ret; |
567 | short vid = -1; | 567 | short vid = -1; |
568 | bool do_bcast = false; | 568 | bool do_bcast; |
569 | 569 | ||
570 | if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE) | 570 | if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE) |
571 | goto dropped; | 571 | goto dropped; |
@@ -598,15 +598,15 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) | |||
598 | tt_local_add(soft_iface, ethhdr->h_source); | 598 | tt_local_add(soft_iface, ethhdr->h_source); |
599 | 599 | ||
600 | orig_node = transtable_search(bat_priv, ethhdr->h_dest); | 600 | orig_node = transtable_search(bat_priv, ethhdr->h_dest); |
601 | if (is_multicast_ether_addr(ethhdr->h_dest) || | 601 | do_bcast = is_multicast_ether_addr(ethhdr->h_dest); |
602 | (orig_node && orig_node->gw_flags)) { | 602 | if (do_bcast || (orig_node && orig_node->gw_flags)) { |
603 | ret = gw_is_target(bat_priv, skb, orig_node); | 603 | ret = gw_is_target(bat_priv, skb, orig_node); |
604 | 604 | ||
605 | if (ret < 0) | 605 | if (ret < 0) |
606 | goto dropped; | 606 | goto dropped; |
607 | 607 | ||
608 | if (ret == 0) | 608 | if (ret) |
609 | do_bcast = true; | 609 | do_bcast = false; |
610 | } | 610 | } |
611 | 611 | ||
612 | /* ethernet packet should be broadcasted */ | 612 | /* ethernet packet should be broadcasted */ |