batman-adv: Prefix main enum with BATADV_

[cascardo/linux.git] / net / batman-adv / send.c

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 72542cb..aad9818 100644 (file)
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -37,7 +37,7 @@ int batadv_send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface,
 {
        struct ethhdr *ethhdr;
 
-       if (hard_iface->if_status != IF_ACTIVE)
+       if (hard_iface->if_status != BATADV_IF_ACTIVE)
                goto send_skb_err;
 
        if (unlikely(!hard_iface->net_dev))
@@ -80,8 +80,8 @@ void batadv_schedule_bat_ogm(struct hard_iface *hard_iface)
 {
        struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
 
-       if ((hard_iface->if_status == IF_NOT_IN_USE) ||
-           (hard_iface->if_status == IF_TO_BE_REMOVED))
+       if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||
+           (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
                return;
 
        /* the interface gets activated here to avoid race conditions between
@@ -90,8 +90,8 @@ void batadv_schedule_bat_ogm(struct hard_iface *hard_iface)
         * outdated packets (especially uninitialized mac addresses) in the
         * packet queue
         */
-       if (hard_iface->if_status == IF_TO_BE_ACTIVATED)
-               hard_iface->if_status = IF_ACTIVE;
+       if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED)
+               hard_iface->if_status = BATADV_IF_ACTIVE;
 
        bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface);
 }
@@ -142,7 +142,8 @@ int batadv_add_bcast_packet_to_list(struct bat_priv *bat_priv,
        struct sk_buff *newskb;
 
        if (!batadv_atomic_dec_not_zero(&bat_priv->bcast_queue_left)) {
-               batadv_dbg(DBG_BATMAN, bat_priv, "bcast packet queue full\n");
+               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
+                          "bcast packet queue full\n");
                goto out;
        }
 
@@ -199,7 +200,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work)
        hlist_del(&forw_packet->list);
        spin_unlock_bh(&bat_priv->forw_bcast_list_lock);
 
-       if (atomic_read(&bat_priv->mesh_state) == MESH_DEACTIVATING)
+       if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING)
                goto out;
 
        /* rebroadcast packet */
@@ -243,7 +244,7 @@ void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work)
        hlist_del(&forw_packet->list);
        spin_unlock_bh(&bat_priv->forw_bat_list_lock);
 
-       if (atomic_read(&bat_priv->mesh_state) == MESH_DEACTIVATING)
+       if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_DEACTIVATING)
                goto out;
 
        bat_priv->bat_algo_ops->bat_ogm_emit(forw_packet);
@@ -271,11 +272,11 @@ void batadv_purge_outstanding_packets(struct bat_priv *bat_priv,
        bool pending;
 
        if (hard_iface)
-               batadv_dbg(DBG_BATMAN, bat_priv,
+               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
                           "purge_outstanding_packets(): %s\n",
                           hard_iface->net_dev->name);
        else
-               batadv_dbg(DBG_BATMAN, bat_priv,
+               batadv_dbg(BATADV_DBG_BATMAN, bat_priv,
                           "purge_outstanding_packets()\n");
 
        /* free bcast list */