diff mbox

batman-adv: B.A.T.M.A.N V - make sure iface is reactivated upon NETDEV_UP event

Message ID 1460576087-21474-1-git-send-email-a@unstable.cc (mailing list archive)
State Superseded, archived
Delegated to: Marek Lindner
Headers

Commit Message

Antonio Quartulli April 13, 2016, 7:34 p.m. UTC 
  At the moment there is no explicit reactivation of an hard-interface
upon NETDEV_UP event. In case of B.A.T.M.A.N. IV the interface is
reactivated as soon as the next OGM is scheduled for sending, but this
mechanism does not work with B.A.T.M.A.N. V. The latter does not rely
on the same scheduling mechanism as its predecessor and for this reason
the hard-interface remains deactivated forever after being brought down
once.

This patch fixes the reactivation mechanism by adding a new routing API
which explicitly allows each algorithm to perform any needed operation
upon interface re-activation.

Such API is optional and is implemented by B.A.T.M.A.N. V only and it
just takes care of setting the iface status to ACTIVE

Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
 net/batman-adv/bat_v.c          | 12 ++++++++++++
 net/batman-adv/hard-interface.c |  3 +++
 net/batman-adv/types.h          |  1 +
 3 files changed, 16 insertions(+)

Comments

Sven Eckelmann April 13, 2016, 8:32 p.m. UTC | #1 
On Thursday 14 April 2016 03:34:47 Antonio Quartulli wrote:
[...]
> diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
> index 9abfb3e..316af66 100644
> --- a/net/batman-adv/types.h
> +++ b/net/batman-adv/types.h
> @@ -1277,6 +1277,7 @@ struct batadv_forw_packet {
>  struct batadv_algo_ops {
>  	struct hlist_node list;
>  	char *name;
> +	void (*bat_iface_activate)(struct batadv_hard_iface *hard_iface);
>  	int (*bat_iface_enable)(struct batadv_hard_iface *hard_iface);
>  	void (*bat_iface_disable)(struct batadv_hard_iface *hard_iface);
>  	void (*bat_iface_update_mac)(struct batadv_hard_iface *hard_iface);

kernel-doc is missing for @bat_iface_activate

Kind regards,
	Sven
Antonio Quartulli April 14, 2016, 1:39 a.m. UTC | #2 
On Wed, Apr 13, 2016 at 10:32:43PM +0200, Sven Eckelmann wrote:
> On Thursday 14 April 2016 03:34:47 Antonio Quartulli wrote:
> [...]
> > diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
> > index 9abfb3e..316af66 100644
> > --- a/net/batman-adv/types.h
> > +++ b/net/batman-adv/types.h
> > @@ -1277,6 +1277,7 @@ struct batadv_forw_packet {
> >  struct batadv_algo_ops {
> >  	struct hlist_node list;
> >  	char *name;
> > +	void (*bat_iface_activate)(struct batadv_hard_iface *hard_iface);
> >  	int (*bat_iface_enable)(struct batadv_hard_iface *hard_iface);
> >  	void (*bat_iface_disable)(struct batadv_hard_iface *hard_iface);
> >  	void (*bat_iface_update_mac)(struct batadv_hard_iface *hard_iface);
> 
> kernel-doc is missing for @bat_iface_activate

Thanks Sven, I sent v2 with the kerneldoc

Cheers,
diff mbox

Patch

diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 3315b9a..4026f19 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -32,10 +32,21 @@ 
 
 #include "bat_v_elp.h"
 #include "bat_v_ogm.h"
+#include "hard-interface.h"
 #include "hash.h"
 #include "originator.h"
 #include "packet.h"
 
+static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface)
+{
+	/* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can
+	 * set the interface as ACTIVE right away, without any risk of race
+	 * condition
+	 */
+	if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED)
+		hard_iface->if_status = BATADV_IF_ACTIVE;
+}
+
 static int batadv_v_iface_enable(struct batadv_hard_iface *hard_iface)
 {
 	int ret;
@@ -274,6 +285,7 @@  static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1,
 
 static struct batadv_algo_ops batadv_batman_v __read_mostly = {
 	.name = "BATMAN_V",
+	.bat_iface_activate = batadv_v_iface_activate,
 	.bat_iface_enable = batadv_v_iface_enable,
 	.bat_iface_disable = batadv_v_iface_disable,
 	.bat_iface_update_mac = batadv_v_iface_update_mac,
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index c61d5b0..0a7deaf 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -407,6 +407,9 @@  batadv_hardif_activate_interface(struct batadv_hard_iface *hard_iface)
 
 	batadv_update_min_mtu(hard_iface->soft_iface);
 
+	if (bat_priv->bat_algo_ops->bat_iface_activate)
+		bat_priv->bat_algo_ops->bat_iface_activate(hard_iface);
+
 out:
 	if (primary_if)
 		batadv_hardif_put(primary_if);
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 9abfb3e..316af66 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1277,6 +1277,7 @@  struct batadv_forw_packet {
 struct batadv_algo_ops {
 	struct hlist_node list;
 	char *name;
+	void (*bat_iface_activate)(struct batadv_hard_iface *hard_iface);
 	int (*bat_iface_enable)(struct batadv_hard_iface *hard_iface);
 	void (*bat_iface_disable)(struct batadv_hard_iface *hard_iface);
 	void (*bat_iface_update_mac)(struct batadv_hard_iface *hard_iface);