FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-03-04 10:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

batman-adv: Prefix bridge_loop_avoidance defines with BATADV_

Browse Source 
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Sven Eckelmann 2012-06-03 22:19:10 +02:00 committed by Antonio Quartulli
parent 036cbfeb6e
commit 3964f7285e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,7 +237,7 @@ static void batadv_bla_del_backbone_claims(struct backbone_gw *backbone_gw)
} }
/* all claims gone, intialize CRC */ /* 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 /* @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->vid = vid;
entry->lasttime = jiffies; entry->lasttime = jiffies;
entry->crc = BLA_CRC_INIT; entry->crc = BATADV_BLA_CRC_INIT;
entry->bat_priv = bat_priv; entry->bat_priv = bat_priv;
atomic_set(&entry->request_sent, 0); atomic_set(&entry->request_sent, 0);
memcpy(entry->orig, orig, ETH_ALEN); memcpy(entry->orig, orig, ETH_ALEN);

2
net/batman-adv/bridge_loop_avoidance.h
View File

@ -36,7 +36,7 @@ void batadv_bla_update_orig_address(struct bat_priv *bat_priv,
int batadv_bla_init(struct bat_priv *bat_priv); int batadv_bla_init(struct bat_priv *bat_priv);
void batadv_bla_free(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 */ #else /* ifdef CONFIG_BATMAN_ADV_BLA */
static inline int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, static inline int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb,