diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-07 21:38:43 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-07 21:38:43 +0400 |
| commit | 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 (patch) | |
| tree | 08c4399e0341f7eb0ccb24e15f2cab687275c2a4 /net/batman-adv/soft-interface.c | |
| parent | 8083f0fc969d9b5353061a7a6f963405057e26b1 (diff) | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
| download | linux-88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9.tar.xz | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
net/batman-adv/soft-interface.c
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -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 aceeabc2ca86..f9cc95728989 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -566,7 +566,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; @@ -600,15 +600,15 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) orig_node = transtable_search(bat_priv, ethhdr->h_source, 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 */ |