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/main.h | |
| 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/main.h')
| -rw-r--r-- | net/batman-adv/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index ced08b936a96..d40910dfc8ea 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -162,7 +162,7 @@ extern struct workqueue_struct *batadv_event_workqueue; int batadv_mesh_init(struct net_device *soft_iface); void batadv_mesh_free(struct net_device *soft_iface); -int batadv_is_my_mac(const uint8_t *addr); +int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_hard_iface * batadv_seq_print_text_primary_if_get(struct seq_file *seq); int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, |