lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback

Browse Source 
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
This commit is contained in:
Marek Lindner
2012-02-07 17:20:49 +08:00
committed by Antonio Quartulli
parent 77af7575c4
commit cd8b78e7e9
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/batman-adv/bat_iv_ogm.c
View File

@@ -67,7 +67,7 @@ static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface)
hard_iface->packet_buff = NULL; hard_iface->packet_buff = NULL;
} }
static void bat_iv_ogm_init_primary(struct hard_iface *hard_iface) static void bat_iv_ogm_primary_iface_set(struct hard_iface *hard_iface)
{ {
struct batman_ogm_packet *batman_ogm_packet; struct batman_ogm_packet *batman_ogm_packet;
@@ -1191,7 +1191,7 @@ static struct bat_algo_ops batman_iv __read_mostly = {
.name = "BATMAN IV", .name = "BATMAN IV",
.bat_iface_enable = bat_iv_ogm_iface_enable, .bat_iface_enable = bat_iv_ogm_iface_enable,
.bat_iface_disable = bat_iv_ogm_iface_disable, .bat_iface_disable = bat_iv_ogm_iface_disable,
.bat_ogm_init_primary = bat_iv_ogm_init_primary, .bat_primary_iface_set = bat_iv_ogm_primary_iface_set,
.bat_ogm_update_mac = bat_iv_ogm_update_mac, .bat_ogm_update_mac = bat_iv_ogm_update_mac,
.bat_ogm_schedule = bat_iv_ogm_schedule, .bat_ogm_schedule = bat_iv_ogm_schedule,
.bat_ogm_emit = bat_iv_ogm_emit, .bat_ogm_emit = bat_iv_ogm_emit,

2
net/batman-adv/hard-interface.c
View File

@@ -146,7 +146,7 @@ static void primary_if_select(struct bat_priv *bat_priv,
if (!new_hard_iface) if (!new_hard_iface)
goto out; goto out;
bat_priv->bat_algo_ops->bat_ogm_init_primary(new_hard_iface); bat_priv->bat_algo_ops->bat_primary_iface_set(new_hard_iface);
primary_if_update_addr(bat_priv, curr_hard_iface); primary_if_update_addr(bat_priv, curr_hard_iface);
out: out:

2
net/batman-adv/main.c
View File

@@ -210,7 +210,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops)
/* all algorithms must implement all ops (for now) */ /* all algorithms must implement all ops (for now) */
if (!bat_algo_ops->bat_iface_enable || if (!bat_algo_ops->bat_iface_enable ||
!bat_algo_ops->bat_iface_disable || !bat_algo_ops->bat_iface_disable ||
!bat_algo_ops->bat_ogm_init_primary || !bat_algo_ops->bat_primary_iface_set ||
!bat_algo_ops->bat_ogm_update_mac || !bat_algo_ops->bat_ogm_update_mac ||
!bat_algo_ops->bat_ogm_schedule || !bat_algo_ops->bat_ogm_schedule ||
!bat_algo_ops->bat_ogm_emit || !bat_algo_ops->bat_ogm_emit ||

4
net/batman-adv/types.h
View File

@@ -381,8 +381,8 @@ struct bat_algo_ops {
int (*bat_iface_enable)(struct hard_iface *hard_iface); int (*bat_iface_enable)(struct hard_iface *hard_iface);
/* de-init routing info when hard-interface is disabled */ /* de-init routing info when hard-interface is disabled */
void (*bat_iface_disable)(struct hard_iface *hard_iface); void (*bat_iface_disable)(struct hard_iface *hard_iface);
/* init primary OGM when primary interface is selected */ /* called when primary interface is selected / changed */
void (*bat_ogm_init_primary)(struct hard_iface *hard_iface); void (*bat_primary_iface_set)(struct hard_iface *hard_iface);
/* init mac addresses of the OGM belonging to this hard-interface */ /* init mac addresses of the OGM belonging to this hard-interface */
void (*bat_ogm_update_mac)(struct hard_iface *hard_iface); void (*bat_ogm_update_mac)(struct hard_iface *hard_iface);
/* prepare a new outgoing OGM for the send queue */ /* prepare a new outgoing OGM for the send queue */