diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-18 14:50:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-18 14:50:38 -0400 |
| commit | 0fecd7504614b0bc98b79e31daffec040ec4e49f (patch) | |
| tree | 42739cceeb428612c0be0e78b8be54e6afd200f4 /net/batman-adv/vis.c | |
| parent | ea2f2fa143ead1a9bf5ce87a3abe403694fe6d78 (diff) | |
| parent | fe8a93b95145c66adf196eea4a919dfe0b7c57db (diff) | |
| download | linux-0fecd7504614b0bc98b79e31daffec040ec4e49f.tar.gz linux-0fecd7504614b0bc98b79e31daffec040ec4e49f.tar.bz2 linux-0fecd7504614b0bc98b79e31daffec040ec4e49f.zip | |
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
Included changes:
- fix MAC address check in case of multiple mesh interfaces
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/vis.c')
| -rw-r--r-- | net/batman-adv/vis.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c index c053244b97bd..6a1e646be96d 100644 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@ -477,7 +477,7 @@ void batadv_receive_client_update_packet(struct batadv_priv *bat_priv, /* Are we the target for this VIS packet? */ if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC && - batadv_is_my_mac(vis_packet->target_orig)) + batadv_is_my_mac(bat_priv, vis_packet->target_orig)) are_target = 1; spin_lock_bh(&bat_priv->vis.hash_lock); @@ -496,7 +496,7 @@ void batadv_receive_client_update_packet(struct batadv_priv *bat_priv, batadv_send_list_add(bat_priv, info); /* ... we're not the recipient (and thus need to forward). */ - } else if (!batadv_is_my_mac(packet->target_orig)) { + } else if (!batadv_is_my_mac(bat_priv, packet->target_orig)) { batadv_send_list_add(bat_priv, info); } |