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 / routing.h

diff --git a/drivers/staging/batman-adv/routing.h b/net/batman-adv/routing.h
similarity index 95%
rename from drivers/staging/batman-adv/routing.h
rename to net/batman-adv/routing.h
index 92674c8d9c030c96b7da1bf39ee2c31eeae33688..f108f230bfdbb88476a55a8278b8001f725f0620 100644 (file)
--- a/drivers/staging/batman-adv/routing.h
+++ b/net/batman-adv/routing.h
@@ -32,6 +32,8 @@ void receive_bat_packet(struct ethhdr *ethhdr,
 void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node,
                   struct neigh_node *neigh_node, unsigned char *hna_buff,
                   int hna_buff_len);
+int route_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if,
+                        int hdr_size);
 int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if);
 int recv_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if);
 int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if);