B.A.T.M.A.N March 2013

b.a.t.m.a.n@lists.open-mesh.org

17 participants
47 discussions

[B.A.T.M.A.N.] pull request: batman-adv 2013-03-28
by Antonio Quartulli 28 Mar '13

28 Mar '13

here you have another batch of patches intended for net-next/linux-3.10. The first one fixes an endianess bug in the new network coding component, sent within our last pull request. It was discovered thanks to Fengguang Wu's automated daily checks on our tree (we upgraded our daily check to look for endianess bugs as well ;-)) Then you have patches from 2/11 to 8/11 implementing the RTNL API for virtual interfaces manipulation: now users can use the "ip" tool to create/delete batman-adv interfaces and to enslave real ones below them. However, to avoid breaking any user tool, we did not disrupt our sysfs API. Patch 11/11 is addressing a new checkpatch complaining by substituting seq_printf with seq_puts when possible (however, checkpatch seems to be broken because it raises false positives in case of multi-line seq_printf). The rest is ordinary house keeping. Please pull or let me know if there is any problem! Thank you, Antonio The following changes since commit 6bdeaba47d87f48a3943b6899d6c6e6f17d52f1d: 6lowpan: use IEEE802154_ADDR_LEN instead of a magic number (2013-03-27 00:52:16 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 0c81465357ffe29da9ff20103afe4a59908e0d30: batman-adv: use seq_puts instead of seq_printf when the format is constant (2013-03-27 10:29:55 +0100) ---------------------------------------------------------------- Included changes: - A fix for the network coding component which has been added within the last pull request (so it is in linux-3.10). The problem has been spotted thanks to Fengguang Wu's automated daily checks on our tree. - Implementation of the RTNL API for virtual interface creation/deletion and slave manipulation - substitution of seq_printf with seq_puts when possible - minor cleanups ---------------------------------------------------------------- Antonio Quartulli (3): batman-adv: free an hard-interface before adding it batman-adv: update Makefile copyright years batman-adv: use seq_puts instead of seq_printf when the format is constant Marek Lindner (1): batman-adv: rename batadv_softif_destroy to reflect sysfs use case Martin Hundebøll (1): batman-adv: Fix endianness errors for network coding Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (5): batman-adv: Move soft-interface initialization to ndo_init batman-adv: Move deinitialization of soft-interface to destructor batman-adv: Don't always delete softif when last slave was removed batman-adv: Allow to use rntl_link for device creation/deletion batman-adv: Allow to modify slaves of soft-interfaces through rntl_link net/batman-adv/Makefile | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/hard-interface.c | 66 ++++++++-- net/batman-adv/hard-interface.h | 13 +- net/batman-adv/main.c | 4 +- net/batman-adv/main.h | 3 +- net/batman-adv/network-coding.c | 10 +- net/batman-adv/originator.c | 4 +- net/batman-adv/packet.h | 2 +- net/batman-adv/soft-interface.c | 269 ++++++++++++++++++++++++++-------------- net/batman-adv/soft-interface.h | 3 +- net/batman-adv/sysfs.c | 6 +- net/batman-adv/vis.c | 4 +- 13 files changed, 268 insertions(+), 120 deletions(-)

2 12

[B.A.T.M.A.N.] MAC address for BAT0 Intefrace
by ajeet singh 28 Mar '13

28 Mar '13

Hello All, I saw in the batman-adv code that random MAC address is being assigned to BAT0 Interface. I need some clarification regarding this. I have tested the following tests, Test Scenarios: Batman_Node_ A (192.0.0.1) ---------------------- Batman_Node_B (192.0.0.2) Test 1: First, I used batman code without any change. I used eth_hw_addr_random () for BAT0 MAC assignment. Result: I am able to ping from node A to Node B Test 2: I commented “eth_hw_addr_random ()” and assigned MAC address of primary interface to BAT0 interface at both nodes. Now, we have same MAC for primary interface and BAT0 at both nodes. Result: I am able to ping from node A to Node B As you guys have assigned the random MAC to BAT0 interface, I wanted to know that what would be potential problems if we assign the MAC addresses of primary interface to the bat0 interface. Thanks in advance. Thanks Ajeet

2 1

[B.A.T.M.A.N.] [PATCH 02/86] batman-adv: fix random jitter calculation
by Steven Rostedt 26 Mar '13

26 Mar '13

3.6.11.1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Akinobu Mita <akinobu.mita(a)gmail.com> [ Upstream commit 143cdd8f33909ff5a153e3f02048738c5964ba26 ] batadv_iv_ogm_emit_send_time() attempts to calculates a random integer in the range of 'orig_interval +- BATADV_JITTER' by the below lines. msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; msecs += (random32() % 2 * BATADV_JITTER); But it actually gets 'orig_interval' or 'orig_interval - BATADV_JITTER' because '%' and '*' have same precedence and associativity is left-to-right. This adds the parentheses at the appropriate position so that it matches original intension. Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Cc: Antonio Quartulli <ordex(a)autistici.org> Cc: b.a.t.m.a.n(a)lists.open-mesh.org Cc: "David S. Miller" <davem(a)davemloft.net> Cc: netdev(a)vger.kernel.org Signed-off-by: David S. Miller <davem(a)davemloft.net> --- net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 469daab..1476f26 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -119,7 +119,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; - msecs += (random32() % 2 * BATADV_JITTER); + msecs += random32() % (2 * BATADV_JITTER); return jiffies + msecs_to_jiffies(msecs); } -- 1.7.10.4

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: don't check the source address twice
by Antonio Quartulli 25 Mar '13

25 Mar '13

From: Antonio Quartulli <antonio(a)open-mesh.com> The source address has already been checked in batadv_check_management_packet() upon packet reception and therefore it does not need to be checked again in ogm_process() Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- bat_iv_ogm.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index da239c5..952a1ff 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1051,9 +1051,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, if (batadv_compare_eth(batadv_ogm_packet->prev_sender, hard_iface->net_dev->dev_addr)) is_my_oldorig = 1; - - if (is_broadcast_ether_addr(ethhdr->h_source)) - is_broadcast = 1; } rcu_read_unlock(); @@ -1071,13 +1068,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, return; } - if (is_broadcast) { - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Drop packet: ignoring all packets with broadcast source addr (sender: %pM)\n", - ethhdr->h_source); - return; - } - if (is_my_orig) { unsigned long *word; int offset; -- 1.8.1.5

1 0

[B.A.T.M.A.N.] [PATCHv2 next] batman-adv: fix interface clean up on error
by Antonio Quartulli 25 Mar '13

25 Mar '13

When enabling an hard_iface for the first time, the hard_iface->soft_iface member is initialised with the newly created soft_iface. However, in case of error during the activation procedure this member has to be set to NULL again, otherwise the hard_iface will result busy and will not be possible to use it anymore This issue has been introduced with edd08535c00a42143989118bc999060893ce0a41 ("batman-adv: Allow to modify slaves of soft-interfaces through rntl_link") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - based on next (the commi introducing the problem is in next, not in maint) - added "introduced-by" in the commit message hard-interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hard-interface.c b/hard-interface.c index fd99e42..b69fe11 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -410,6 +410,7 @@ out: err_upper: netdev_upper_dev_unlink(hard_iface->net_dev, soft_iface); err_dev: + hard_iface->soft_iface = NULL; dev_put(soft_iface); err: batadv_hardif_free_ref(hard_iface); -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH next] batman-adv: use seq_puts instead of seq_printf when the format is constant
by Antonio Quartulli 25 Mar '13

25 Mar '13

As reported by checkpatch, seq_puts has to be preferred with respect to seq_printf when the format is a constant string (no va_args) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- However checkpatch seems to be implementing this check in a wrong way: multi-line seq_printf are reported like having no arguments after the format. Cheers, gateway_client.c | 2 +- main.c | 2 +- network-coding.c | 8 ++++---- originator.c | 4 ++-- vis.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gateway_client.c b/gateway_client.c index 34f99a4..f105219 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -500,7 +500,7 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) rcu_read_unlock(); if (gw_count == 0) - seq_printf(seq, "No gateways in range ...\n"); + seq_puts(seq, "No gateways in range ...\n"); out: if (primary_if) diff --git a/main.c b/main.c index 62b1f89..6277735 100644 --- a/main.c +++ b/main.c @@ -419,7 +419,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) { struct batadv_algo_ops *bat_algo_ops; - seq_printf(seq, "Available routing algorithms:\n"); + seq_puts(seq, "Available routing algorithms:\n"); hlist_for_each_entry(bat_algo_ops, &batadv_algo_list, list) { seq_printf(seq, "%s\n", bat_algo_ops->name); diff --git a/network-coding.c b/network-coding.c index 086c107..6b9a544 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1760,23 +1760,23 @@ int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset) hlist_for_each_entry_rcu(orig_node, head, hash_entry) { seq_printf(seq, "Node: %pM\n", orig_node->orig); - seq_printf(seq, " Ingoing: "); + seq_puts(seq, " Ingoing: "); /* For each in_nc_node to this orig_node */ list_for_each_entry_rcu(nc_node, &orig_node->in_coding_list, list) seq_printf(seq, "%pM ", nc_node->addr); - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); - seq_printf(seq, " Outgoing: "); + seq_puts(seq, " Outgoing: "); /* For out_nc_node to this orig_node */ list_for_each_entry_rcu(nc_node, &orig_node->out_coding_list, list) seq_printf(seq, "%pM ", nc_node->addr); - seq_printf(seq, "\n\n"); + seq_puts(seq, "\n\n"); } rcu_read_unlock(); } diff --git a/originator.c b/originator.c index 585e684..2f34525 100644 --- a/originator.c +++ b/originator.c @@ -465,7 +465,7 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset) neigh_node_tmp->tq_avg); } - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); batman_count++; next: @@ -475,7 +475,7 @@ next: } if (batman_count == 0) - seq_printf(seq, "No batman nodes in range ...\n"); + seq_puts(seq, "No batman nodes in range ...\n"); out: if (primary_if) diff --git a/vis.c b/vis.c index c053244..962ccf3 100644 --- a/vis.c +++ b/vis.c @@ -149,7 +149,7 @@ static void batadv_vis_data_read_prim_sec(struct seq_file *seq, hlist_for_each_entry(entry, if_list, list) { if (entry->primary) - seq_printf(seq, "PRIMARY, "); + seq_puts(seq, "PRIMARY, "); else seq_printf(seq, "SEC %pM, ", entry->addr); } @@ -207,7 +207,7 @@ static void batadv_vis_data_read_entries(struct seq_file *seq, if (batadv_compare_eth(entry->addr, packet->vis_orig)) batadv_vis_data_read_prim_sec(seq, list); - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); } } -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCHv3] batman-adv: fix old master freeing operation
by Antonio Quartulli 25 Mar '13

25 Mar '13

When a new hard_iface has a master already, ndo_del_slave has to be used in order to let the old master perform its cleaning up routine correctly. Unsetting the master iface only can lead to a inconsistent state in the master driver. Introduced by 5e57e3bff429cd403f0e30af69cf87a2cd55598f ("batman-adv: free an hard-interface before adding it"). Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v2: - patch restyled - added compat code for <2.6.39 (Thanks to Simon) v3: - commit message rewording - change EINVAL to EBUSY to better describe the error compat.h | 3 +++ hard-interface.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index ba07ae4..0663df5 100644 --- a/compat.h +++ b/compat.h @@ -161,6 +161,9 @@ static const struct { \ } __attribute__((unused)) __useless_ops1 = { \ .ndo_validate_addr +#define ndo_del_slave ndo_init +#define ndo_init(x, y) ndo_init - master->netdev_ops->ndo_init - EBUSY + #endif /* < KERNEL_VERSION(2, 6, 39) */ diff --git a/hard-interface.c b/hard-interface.c index fd99e42..37c1b51 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -307,6 +307,30 @@ batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface) batadv_update_min_mtu(hard_iface->soft_iface); } +/** + * batadv_master_del_slave - remove hard_iface from the current master interface + * @slave: the interface enslaved in another master + * @master: the master from which slave has to be removed + * + * Invoke ndo_del_slave on master passing slave as argument. In this way slave + * is free'd and master can correctly change its internal state. + * Return 0 on success, a negative value representing the error otherwise + */ +static int batadv_master_del_slave(struct batadv_hard_iface *slave, + struct net_device *master) +{ + int ret; + + if (!master) + return 0; + + ret = -EBUSY; + if (master->netdev_ops->ndo_del_slave) + ret = master->netdev_ops->ndo_del_slave(master, slave->net_dev); + + return ret; +} + int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) { @@ -346,8 +370,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, * in that case unlink it first */ master = netdev_master_upper_dev_get(hard_iface->net_dev); - if (master) - netdev_upper_dev_unlink(hard_iface->net_dev, master); + ret = batadv_master_del_slave(hard_iface, master); + if (ret) + goto err_dev; hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: fix interface clean up on error
by Antonio Quartulli 24 Mar '13

24 Mar '13

When enabling an hard_iface for the first time, the hard_iface->soft_iface member is initialised with the newly created soft_iface. However, in case of error during the activation procedure this member has to be set to NULL again, otherwise the hard_iface will result busy and will not be possible to use it anymore Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- it is possible to easily reproduce the bug without the patch: $ batctl if add eth0 $ brctl addbr br0 $ brctl addif br0 bat0 $ batctl if add br0 Error - can't write to file '/sys/class/net/br0/batman_adv/mesh_iface': Device or resource busy $ batctl if add br0 $ [no error anymore because br0 is already "associated" to bat0 and check at sysfs.c:575 evaluates to true] with the patch: $ batctl if add eth0 $ brctl addbr br0 $ brctl addif br0 bat0 $ batctl if add br0 Error - can't write to file '/sys/class/net/br0/batman_adv/mesh_iface': Device or resource busy $ batctl if add br0 Error - can't write to file '/sys/class/net/br0/batman_adv/mesh_iface': Device or resource busy $ Cheers, hard-interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hard-interface.c b/hard-interface.c index 368219e..70bc9ce 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -402,6 +402,7 @@ out: return 0; err_dev: + hard_iface->soft_iface = NULL; dev_put(soft_iface); err: batadv_hardif_free_ref(hard_iface); -- 1.8.1.5

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: invoke ogm_schedule() only when the interface is activated
by Antonio Quartulli 23 Mar '13

23 Mar '13

the current implementation works as expected because once ogm_schedule() has been invoked once it will continue to invoke itself periodically thanks to the schedule (but not sent) packets. A correct behaviour would be to wait for the interface to be ready for sending before scheduling the first OGM. Moreover another routing algorithm may not schedule any packet because the interface is not active yet, and this would lead to a breakage in the interface activation procedure Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- hard-interface.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index d55213c..4a1a24b 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -339,6 +339,8 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface) batadv_update_min_mtu(hard_iface->soft_iface); + /* begin scheduling originator messages on that interface */ + batadv_schedule_bat_ogm(hard_iface); out: if (primary_if) batadv_hardif_free_ref(primary_if); @@ -453,9 +455,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, "Not using interface %s (retrying later): interface not active\n", hard_iface->net_dev->name); - /* begin scheduling originator messages on that interface */ - batadv_schedule_bat_ogm(hard_iface); - out: return 0; -- 1.8.1.5

1 0

[B.A.T.M.A.N.] [RFC] batman-adv: make the routing API more generic
by Antonio Quartulli 23 Mar '13

23 Mar '13

From: Antonio Quartulli <antonio(a)open-mesh.com> The current routing API exports bat_ogm_emit() and bat_ogm_schedule() which are strictly related to the way B.A.T.M.A.N. IV was implemented. Moreover they are invoked like "callbacks" and not like real APIs. Implementing a new algorithm which behaves differently using this schema is difficult or probably impossible at all. Remove bat_ogm_emit() and bat_ogm_schedule(), which can be directly handled inside the routing code and add bat_iface_activate() which is invoked when the interface is ready to send packets. This new function is used by the routing code to start any sending mechanism or periodic work Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- bat_iv_ogm.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- hard-interface.c | 10 +++++++--- main.c | 3 +-- send.c | 56 +------------------------------------------------------- send.h | 1 + types.h | 7 +++---- 6 files changed, 56 insertions(+), 68 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 071f288..5d6cc79 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -376,6 +376,8 @@ out: return res; } +static void batadv_iv_ogm_send_outstanding(struct work_struct *work); + /* create a new aggregated packet and add this packet to it */ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, int packet_len, unsigned long send_time, @@ -447,7 +449,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, /* start timer for this packet */ INIT_DELAYED_WORK(&forw_packet_aggr->delayed_work, - batadv_send_outstanding_bat_ogm_packet); + batadv_iv_ogm_send_outstanding); queue_delayed_work(batadv_event_workqueue, &forw_packet_aggr->delayed_work, send_time - jiffies); @@ -601,6 +603,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) uint32_t seqno; uint8_t bandwidth; + if (hard_iface->if_status != BATADV_IF_ACTIVE) + return; + vis_server = atomic_read(&bat_priv->vis_mode); primary_if = batadv_primary_if_get_selected(bat_priv); @@ -643,6 +648,40 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_hardif_free_ref(primary_if); } +static void batadv_iv_ogm_send_outstanding(struct work_struct *work) +{ + struct delayed_work *delayed_work; + struct batadv_forw_packet *forw_packet; + struct batadv_priv *bat_priv; + + delayed_work = container_of(work, struct delayed_work, work); + forw_packet = container_of(delayed_work, struct batadv_forw_packet, + delayed_work); + bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface); + spin_lock_bh(&bat_priv->forw_bat_list_lock); + hlist_del(&forw_packet->list); + spin_unlock_bh(&bat_priv->forw_bat_list_lock); + + if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) + goto out; + + batadv_iv_ogm_emit(forw_packet); + + /* we have to have at least one packet in the queue + * to determine the queues wake up time unless we are + * shutting down + */ + if (forw_packet->own) + batadv_iv_ogm_schedule(forw_packet->if_incoming); + +out: + /* don't count own packet */ + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + + batadv_forw_packet_free(forw_packet); +} + static void batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, @@ -1280,7 +1319,8 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, /* did we receive a B.A.T.M.A.N. IV OGM packet on an interface * that does not have B.A.T.M.A.N. IV enabled ? */ - if (bat_priv->bat_algo_ops->bat_ogm_emit != batadv_iv_ogm_emit) + if (bat_priv->bat_algo_ops->bat_iface_activate != + batadv_iv_ogm_schedule) return NET_RX_DROP; batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX); @@ -1317,8 +1357,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .bat_iface_disable = batadv_iv_ogm_iface_disable, .bat_iface_update_mac = batadv_iv_ogm_iface_update_mac, .bat_primary_iface_set = batadv_iv_ogm_primary_iface_set, - .bat_ogm_schedule = batadv_iv_ogm_schedule, - .bat_ogm_emit = batadv_iv_ogm_emit, + .bat_iface_activate = batadv_iv_ogm_schedule, }; int __init batadv_iv_init(void) diff --git a/hard-interface.c b/hard-interface.c index d55213c..8e57693 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -339,6 +339,13 @@ batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface) batadv_update_min_mtu(hard_iface->soft_iface); + /* the interface gets activated here to avoid race conditions when the + * originator mac has not properly set yet + */ + hard_iface->if_status = BATADV_IF_ACTIVE; + + bat_priv->bat_algo_ops->bat_iface_activate(hard_iface); + out: if (primary_if) batadv_hardif_free_ref(primary_if); @@ -453,9 +460,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, "Not using interface %s (retrying later): interface not active\n", hard_iface->net_dev->name); - /* begin scheduling originator messages on that interface */ - batadv_schedule_bat_ogm(hard_iface); - out: return 0; diff --git a/main.c b/main.c index 62b1f89..31f71b6 100644 --- a/main.c +++ b/main.c @@ -383,8 +383,7 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) !bat_algo_ops->bat_iface_disable || !bat_algo_ops->bat_iface_update_mac || !bat_algo_ops->bat_primary_iface_set || - !bat_algo_ops->bat_ogm_schedule || - !bat_algo_ops->bat_ogm_emit) { + !bat_algo_ops->bat_iface_activate) { pr_info("Routing algo '%s' does not implement required ops\n", bat_algo_ops->name); ret = -EINVAL; diff --git a/send.c b/send.c index eb16b04..0642756 100644 --- a/send.c +++ b/send.c @@ -118,27 +118,7 @@ bool batadv_send_skb_to_orig(struct sk_buff *skb, return true; } -void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface) -{ - struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - - if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) || - (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)) - return; - - /* the interface gets activated here to avoid race conditions between - * the moment of activating the interface in - * hardif_activate_interface() where the originator mac is set and - * outdated packets (especially uninitialized mac addresses) in the - * packet queue - */ - if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED) - hard_iface->if_status = BATADV_IF_ACTIVE; - - bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface); -} - -static void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) { if (forw_packet->skb) kfree_skb(forw_packet->skb); @@ -285,40 +265,6 @@ out: atomic_inc(&bat_priv->bcast_queue_left); } -void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work) -{ - struct delayed_work *delayed_work; - struct batadv_forw_packet *forw_packet; - struct batadv_priv *bat_priv; - - delayed_work = container_of(work, struct delayed_work, work); - forw_packet = container_of(delayed_work, struct batadv_forw_packet, - delayed_work); - bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface); - spin_lock_bh(&bat_priv->forw_bat_list_lock); - hlist_del(&forw_packet->list); - spin_unlock_bh(&bat_priv->forw_bat_list_lock); - - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING) - goto out; - - bat_priv->bat_algo_ops->bat_ogm_emit(forw_packet); - - /* we have to have at least one packet in the queue - * to determine the queues wake up time unless we are - * shutting down - */ - if (forw_packet->own) - batadv_schedule_bat_ogm(forw_packet->if_incoming); - -out: - /* don't count own packet */ - if (!forw_packet->own) - atomic_inc(&bat_priv->batman_queue_left); - - batadv_forw_packet_free(forw_packet); -} - void batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, const struct batadv_hard_iface *hard_iface) diff --git a/send.h b/send.h index 38e662f..0a966e6 100644 --- a/send.h +++ b/send.h @@ -34,5 +34,6 @@ void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work); void batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, const struct batadv_hard_iface *hard_iface); +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet); #endif /* _NET_BATMAN_ADV_SEND_H_ */ diff --git a/types.h b/types.h index 5f542bd..8466a85 100644 --- a/types.h +++ b/types.h @@ -946,8 +946,8 @@ struct batadv_vis_if_list_entry { * @bat_iface_update_mac: (re-)init mac addresses of the protocol information * belonging to this hard-interface * @bat_primary_iface_set: called when primary interface is selected / changed - * @bat_ogm_schedule: prepare a new outgoing OGM for the send queue - * @bat_ogm_emit: send scheduled OGM + * @bat_iface_activate: called when the interface is activated and can be used + * for transmissions */ struct batadv_algo_ops { struct hlist_node list; @@ -956,8 +956,7 @@ struct batadv_algo_ops { void (*bat_iface_disable)(struct batadv_hard_iface *hard_iface); void (*bat_iface_update_mac)(struct batadv_hard_iface *hard_iface); void (*bat_primary_iface_set)(struct batadv_hard_iface *hard_iface); - void (*bat_ogm_schedule)(struct batadv_hard_iface *hard_iface); - void (*bat_ogm_emit)(struct batadv_forw_packet *forw_packet); + void (*bat_iface_activate)(struct batadv_hard_iface *hard_iface); }; /** -- 1.8.1.5

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N March 2013