The following commit has been merged in the next branch: commit 4348aade64699ddf67f383a0841e0d0042675178 Author: Marek Lindner lindner_marek@yahoo.de Date: Tue Feb 7 17:20:47 2012 +0800

batman-adv: add iface_disable() callback to routing API

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 4ac2d1d..98c41f5 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -52,6 +52,12 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) batman_ogm_packet->ttvn = 0; }

+static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface) +{ + kfree(hard_iface->packet_buff); + hard_iface->packet_buff = NULL; +} + static void bat_iv_ogm_init_primary(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; @@ -1186,6 +1192,7 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming, static struct bat_algo_ops batman_iv __read_mostly = { .name = "BATMAN IV", .bat_iface_enable = bat_iv_ogm_iface_enable, + .bat_iface_disable = bat_iv_ogm_iface_disable, .bat_ogm_init_primary = bat_iv_ogm_init_primary, .bat_ogm_update_mac = bat_iv_ogm_update_mac, .bat_ogm_schedule = bat_iv_ogm_schedule, diff --git a/hard-interface.c b/hard-interface.c index 4052444..ec2f478 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -409,8 +409,7 @@ void hardif_disable_interface(struct hard_iface *hard_iface) hardif_free_ref(new_if); }

- kfree(hard_iface->packet_buff); - hard_iface->packet_buff = NULL; + bat_priv->bat_algo_ops->bat_iface_disable(hard_iface); hard_iface->if_status = IF_NOT_IN_USE;

/* delete all references to this hard_iface */ diff --git a/main.c b/main.c index 8bc27e1..c4a9b2b 100644 --- a/main.c +++ b/main.c @@ -209,6 +209,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops)

/* all algorithms must implement all ops (for now) */ if (!bat_algo_ops->bat_iface_enable || + !bat_algo_ops->bat_iface_disable || !bat_algo_ops->bat_ogm_init_primary || !bat_algo_ops->bat_ogm_update_mac || !bat_algo_ops->bat_ogm_schedule || diff --git a/types.h b/types.h index 4b92248..b034cf2 100644 --- a/types.h +++ b/types.h @@ -379,6 +379,8 @@ struct bat_algo_ops { char *name; /* init routing info when hard-interface is enabled */ void (*bat_iface_enable)(struct hard_iface *hard_iface); + /* de-init routing info when hard-interface is disabled */ + void (*bat_iface_disable)(struct hard_iface *hard_iface); /* init primary OGM when primary interface is selected */ void (*bat_ogm_init_primary)(struct hard_iface *hard_iface); /* init mac addresses of the OGM belonging to this hard-interface */