Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / batman-adv / unicast.h

diff --git a/drivers/staging/batman-adv/unicast.h b/net/batman-adv/unicast.h
similarity index 76%
rename from drivers/staging/batman-adv/unicast.h
rename to net/batman-adv/unicast.h
index 79736977190069fdd4800a672408c3ed2f713644..e32b7867a9a4a08828cb534b7e7e76b7777da74b 100644 (file)
--- a/drivers/staging/batman-adv/unicast.h
+++ b/net/batman-adv/unicast.h
@@ -25,15 +25,11 @@
 #define FRAG_TIMEOUT 10000     /* purge frag list entrys after time in ms */
 #define FRAG_BUFFER_SIZE 6     /* number of list elements in buffer */
 
-struct sk_buff *merge_frag_packet(struct list_head *head,
-       struct frag_packet_list_entry *tfp,
-       struct sk_buff *skb);
-
-void create_frag_entry(struct list_head *head, struct sk_buff *skb);
-int create_frag_buffer(struct list_head *head);
-struct frag_packet_list_entry *search_frag_packet(struct list_head *head,
-       struct unicast_frag_packet *up);
+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 batman_if *batman_if, uint8_t dstaddr[]);
 
 #endif /* _NET_BATMAN_ADV_UNICAST_H_ */