batman-adv: Prefix packet structs with batadv_

[deliverable/linux.git] / net / batman-adv / unicast.h

diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h
index a9faf6b1db197e1842a894585b1be8805ab815a9..e0b6e335797ed46fe563c579b7995fbf4e8021d6 100644 (file)
--- a/net/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors:
  *
  * Andreas Langer
  *
@@ -16,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_UNICAST_H_
@@ -24,33 +22,34 @@
 
 #include "packet.h"
 
-#define FRAG_TIMEOUT 10000     /* purge frag list entries after time in ms */
-#define FRAG_BUFFER_SIZE 6     /* number of list elements in buffer */
+#define BATADV_FRAG_TIMEOUT 10000 /* purge frag list entries after time in ms */
+#define BATADV_FRAG_BUFFER_SIZE 6 /* number of list elements in buffer */
 
-int frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-                       struct sk_buff **new_skb);
-void frag_list_free(struct list_head *head);
-int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
-int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
-                 struct hard_iface *hard_iface, const uint8_t dstaddr[]);
+int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+                              struct sk_buff **new_skb);
+void batadv_frag_list_free(struct list_head *head);
+int batadv_unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv);
+int batadv_frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+                        struct hard_iface *hard_iface,
+                        const uint8_t dstaddr[]);
 
-static inline int frag_can_reassemble(const struct sk_buff *skb, int mtu)
+static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu)
 {
-       const struct unicast_frag_packet *unicast_packet;
+       const struct batadv_unicast_frag_packet *unicast_packet;
        int uneven_correction = 0;
        unsigned int merged_size;
 
-       unicast_packet = (struct unicast_frag_packet *)skb->data;
+       unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;
 
-       if (unicast_packet->flags & UNI_FRAG_LARGETAIL) {
-               if (unicast_packet->flags & UNI_FRAG_HEAD)
+       if (unicast_packet->flags & BATADV_UNI_FRAG_LARGETAIL) {
+               if (unicast_packet->flags & BATADV_UNI_FRAG_HEAD)
                        uneven_correction = 1;
                else
                        uneven_correction = -1;
        }
 
        merged_size = (skb->len - sizeof(*unicast_packet)) * 2;
-       merged_size += sizeof(struct unicast_packet) + uneven_correction;
+       merged_size += sizeof(struct batadv_unicast_packet) + uneven_correction;
 
        return merged_size <= mtu;
 }