Commit 3964f7285eba48b971b11dc51ba0a6e41cb995b3
Committed by
Antonio Quartulli
Antonio Quartulli
1 parent
036cbfeb6e
batman-adv: Prefix bridge_loop_avoidance defines with BATADV_
Reported-by: Martin Hundebøll <martin@hundeboll.net> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff
net/batman-adv/bridge_loop_avoidance.c
| ... | ... | @@ -237,7 +237,7 @@ |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | /* all claims gone, intialize CRC */ |
| 240 | - backbone_gw->crc = BLA_CRC_INIT; | |
| 240 | + backbone_gw->crc = BATADV_BLA_CRC_INIT; | |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /* @bat_priv: the bat priv with all the soft interface information |
| ... | ... | @@ -375,7 +375,7 @@ |
| 375 | 375 | |
| 376 | 376 | entry->vid = vid; |
| 377 | 377 | entry->lasttime = jiffies; |
| 378 | - entry->crc = BLA_CRC_INIT; | |
| 378 | + entry->crc = BATADV_BLA_CRC_INIT; | |
| 379 | 379 | entry->bat_priv = bat_priv; |
| 380 | 380 | atomic_set(&entry->request_sent, 0); |
| 381 | 381 | memcpy(entry->orig, orig, ETH_ALEN); |
net/batman-adv/bridge_loop_avoidance.h
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | int batadv_bla_init(struct bat_priv *bat_priv); |
| 37 | 37 | void batadv_bla_free(struct bat_priv *bat_priv); |
| 38 | 38 | |
| 39 | -#define BLA_CRC_INIT 0 | |
| 39 | +#define BATADV_BLA_CRC_INIT 0 | |
| 40 | 40 | #else /* ifdef CONFIG_BATMAN_ADV_BLA */ |
| 41 | 41 | |
| 42 | 42 | static inline int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, |