commit 56303d34a332be8e2f4daf7891ebc12cb7900529
author Sven Eckelmann <sven@narfation.org> Tue Jun 05 22:31:31 2012 +0200
committer Antonio Quartulli <ordex@autistici.org> Sun Jul 01 22:47:21 2012 +0200
tree bc972916771e698bd8a88fd66917950ce0bd48c1
parent 96412690116afcc1b2705615b5a7c8dc6c5e905f

batman-adv: Prefix types structs with batadv_

Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

net/batman-adv/unicast.h

diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h
index e0b6e33..1c46e2e 100644
--- a/net/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -25,12 +25,13 @@
 #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 batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
+int batadv_frag_reassemble_skb(struct sk_buff *skb,
+			       struct batadv_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,
+int batadv_unicast_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv);
+int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
+			 struct batadv_hard_iface *hard_iface,
 			 const uint8_t dstaddr[]);
 
 static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu)