]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
batman-adv: Prefix bridge_loop_avoidance defines with BATADV_
authorSven Eckelmann <sven@narfation.org>
Sun, 3 Jun 2012 20:19:10 +0000 (22:19 +0200)
committerAntonio Quartulli <ordex@autistici.org>
Thu, 28 Jun 2012 06:44:56 +0000 (08:44 +0200)
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
net/batman-adv/bridge_loop_avoidance.c
net/batman-adv/bridge_loop_avoidance.h

index 0592d2bcb9b538a5f34d7f390920bcf999a92c2c..42b8a2079250fe1c48eb0c08f7b774b678c460d6 100644 (file)
@@ -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);
index 9818b1e4c59ec160b04d736c5eb887a23efc78c6..58563f0cf61d8150a691d178f74039ebf378a434 100644 (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);
 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,