Commit 3964f728 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix bridge_loop_avoidance defines with BATADV_ 



Reported-by: default avatarMartin Hundebøll <martin@hundeboll.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent 036cbfeb

net/batman-adv/bridge_loop_avoidance.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static void batadv_bla_del_backbone_claims(struct backbone_gw *backbone_gw) 
	}



	/* all claims gone, intialize CRC */

	backbone_gw->crc = BLA_CRC_INIT;

	backbone_gw->crc = BATADV_BLA_CRC_INIT;

}



/* @bat_priv: the bat priv with all the soft interface information
@@ -375,7 +375,7 @@ static struct backbone_gw *batadv_bla_get_backbone_gw(struct bat_priv *bat_priv, 


	entry->vid = vid;

	entry->lasttime = jiffies;

	entry->crc = BLA_CRC_INIT;

	entry->crc = BATADV_BLA_CRC_INIT;

	entry->bat_priv = bat_priv;

	atomic_set(&entry->request_sent, 0);

	memcpy(entry->orig, orig, ETH_ALEN);

net/batman-adv/bridge_loop_avoidance.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void batadv_bla_update_orig_address(struct bat_priv *bat_priv, 
int batadv_bla_init(struct bat_priv *bat_priv);

void batadv_bla_free(struct bat_priv *bat_priv);



#define BLA_CRC_INIT	0

#define BATADV_BLA_CRC_INIT	0

#else /* ifdef CONFIG_BATMAN_ADV_BLA */



static inline int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE