aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/soft-interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/soft-interface.c')
-rw-r--r--net/batman-adv/soft-interface.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index cbc36f0ec242..a4b5e64bf0c7 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -109,9 +109,9 @@ static int interface_set_mac_addr(struct net_device *dev, void *p)
109 109
110 /* only modify transtable if it has been initialized before */ 110 /* only modify transtable if it has been initialized before */
111 if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) { 111 if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) {
112 tt_local_remove(bat_priv, dev->dev_addr, 112 batadv_tt_local_remove(bat_priv, dev->dev_addr,
113 "mac address changed", false); 113 "mac address changed", false);
114 tt_local_add(dev, addr->sa_data, NULL_IFINDEX); 114 batadv_tt_local_add(dev, addr->sa_data, NULL_IFINDEX);
115 } 115 }
116 116
117 memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); 117 memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
@@ -166,7 +166,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
166 goto dropped; 166 goto dropped;
167 167
168 /* Register the client MAC in the transtable */ 168 /* Register the client MAC in the transtable */
169 tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); 169 batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
170 170
171 /* don't accept stp packets. STP does not help in meshes. 171 /* don't accept stp packets. STP does not help in meshes.
172 * better use the bridge loop avoidance ... 172 * better use the bridge loop avoidance ...
@@ -303,7 +303,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
303 303
304 soft_iface->last_rx = jiffies; 304 soft_iface->last_rx = jiffies;
305 305
306 if (is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) 306 if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest))
307 goto dropped; 307 goto dropped;
308 308
309 /* Let the bridge loop avoidance check the packet. If will 309 /* Let the bridge loop avoidance check the packet. If will