Freeing all the resources when DAT is disabled need a much more complicated locking system to prevent concurrent enable/disable operations to destroy the internal state of the component. For now it is safe to avoid such freeing operation at all when DAT gets disabled.
Signed-off-by: Antonio Quartulli ordex@autistici.org --- distributed-arp-table.c | 10 ---------- sysfs.c | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/distributed-arp-table.c b/distributed-arp-table.c index c933615..7921030 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1061,13 +1061,3 @@ out: batadv_dat_entry_free_ref(dat_entry); return ret; } - -void batadv_dat_switch(struct net_device *net_dev) -{ - struct batadv_priv *bat_priv = netdev_priv(net_dev); - - if (atomic_read(&bat_priv->distributed_arp_table)) - batadv_dat_init(bat_priv); - else - batadv_dat_free(bat_priv); -} diff --git a/sysfs.c b/sysfs.c index 9dc58b5..84a55cb 100644 --- a/sysfs.c +++ b/sysfs.c @@ -422,8 +422,7 @@ BATADV_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); BATADV_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); #endif #ifdef CONFIG_BATMAN_ADV_DAT -BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, - batadv_dat_switch); +BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, NULL); #endif BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu); BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);