diff options
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 9301e21052e7..d6aaf9fa64d4 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -543,11 +543,11 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) | |||
543 | if (!is_valid_ether_addr(addr->sa_data)) | 543 | if (!is_valid_ether_addr(addr->sa_data)) |
544 | return -EADDRNOTAVAIL; | 544 | return -EADDRNOTAVAIL; |
545 | 545 | ||
546 | /* only modify hna-table if it has been initialised before */ | 546 | /* only modify transtable if it has been initialised before */ |
547 | if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) { | 547 | if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) { |
548 | hna_local_remove(bat_priv, dev->dev_addr, | 548 | tt_local_remove(bat_priv, dev->dev_addr, |
549 | "mac address changed"); | 549 | "mac address changed"); |
550 | hna_local_add(dev, addr->sa_data); | 550 | tt_local_add(dev, addr->sa_data); |
551 | } | 551 | } |
552 | 552 | ||
553 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); | 553 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); |
@@ -605,7 +605,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) | |||
605 | goto dropped; | 605 | goto dropped; |
606 | 606 | ||
607 | /* TODO: check this for locks */ | 607 | /* TODO: check this for locks */ |
608 | hna_local_add(soft_iface, ethhdr->h_source); | 608 | tt_local_add(soft_iface, ethhdr->h_source); |
609 | 609 | ||
610 | if (is_multicast_ether_addr(ethhdr->h_dest)) { | 610 | if (is_multicast_ether_addr(ethhdr->h_dest)) { |
611 | ret = gw_is_target(bat_priv, skb); | 611 | ret = gw_is_target(bat_priv, skb); |
@@ -843,7 +843,7 @@ struct net_device *softif_create(char *name) | |||
843 | 843 | ||
844 | atomic_set(&bat_priv->mesh_state, MESH_INACTIVE); | 844 | atomic_set(&bat_priv->mesh_state, MESH_INACTIVE); |
845 | atomic_set(&bat_priv->bcast_seqno, 1); | 845 | atomic_set(&bat_priv->bcast_seqno, 1); |
846 | atomic_set(&bat_priv->hna_local_changed, 0); | 846 | atomic_set(&bat_priv->tt_local_changed, 0); |
847 | 847 | ||
848 | bat_priv->primary_if = NULL; | 848 | bat_priv->primary_if = NULL; |
849 | bat_priv->num_ifaces = 0; | 849 | bat_priv->num_ifaces = 0; |