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 / soft-interface.h

diff --git a/drivers/staging/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h
similarity index 85%
rename from drivers/staging/batman-adv/soft-interface.h
rename to net/batman-adv/soft-interface.h
index 843a7ec082fed935ce4a80d8fe8a22def227ce63..02b77334d10d5889ba72077aa6db29b4e1c8dfb3 100644 (file)
--- a/drivers/staging/batman-adv/soft-interface.h
+++ b/net/batman-adv/soft-interface.h
@@ -23,9 +23,12 @@
 #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_
 
 int my_skb_head_push(struct sk_buff *skb, unsigned int len);
+int softif_neigh_seq_print_text(struct seq_file *seq, void *offset);
+void softif_neigh_purge(struct bat_priv *bat_priv);
 int interface_tx(struct sk_buff *skb, struct net_device *soft_iface);
 void interface_rx(struct net_device *soft_iface,
-                 struct sk_buff *skb, int hdr_size);
+                 struct sk_buff *skb, struct batman_if *recv_if,
+                 int hdr_size);
 struct net_device *softif_create(char *name);
 void softif_destroy(struct net_device *soft_iface);