The following commit has been merged in the master branch: commit d8b763533449cef443267977dcbbb44741477207 Author: Sven Eckelmann sven@narfation.org Date: Wed May 16 20:23:17 2012 +0200

batman-adv: Prefix unicast local static functions with batadv_

All non-static symbols of batman-adv were prefixed with batadv_ to avoid collisions with other symbols of the kernel. Other symbols of batman-adv should use the same prefix to keep the naming scheme consistent.

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/unicast.c b/unicast.c index d5efa40..bc2f897 100644 --- a/unicast.c +++ b/unicast.c @@ -29,9 +29,10 @@ #include "hard-interface.h"

-static struct sk_buff *frag_merge_packet(struct list_head *head, - struct frag_packet_list_entry *tfp, - struct sk_buff *skb) +static struct sk_buff * +batadv_frag_merge_packet(struct list_head *head, + struct frag_packet_list_entry *tfp, + struct sk_buff *skb) { struct unicast_frag_packet *up = (struct unicast_frag_packet *)skb->data; @@ -75,7 +76,8 @@ err: return NULL; }

-static void frag_create_entry(struct list_head *head, struct sk_buff *skb) +static void batadv_frag_create_entry(struct list_head *head, + struct sk_buff *skb) { struct frag_packet_list_entry *tfp; struct unicast_frag_packet *up = @@ -91,7 +93,7 @@ static void frag_create_entry(struct list_head *head, struct sk_buff *skb) return; }

-static int frag_create_buffer(struct list_head *head) +static int batadv_frag_create_buffer(struct list_head *head) { int i; struct frag_packet_list_entry *tfp; @@ -111,8 +113,9 @@ static int frag_create_buffer(struct list_head *head) return 0; }

-static struct frag_packet_list_entry *frag_search_packet(struct list_head *head, - const struct unicast_frag_packet *up) +static struct frag_packet_list_entry * +batadv_frag_search_packet(struct list_head *head, + const struct unicast_frag_packet *up) { struct frag_packet_list_entry *tfp; struct unicast_frag_packet *tmp_up = NULL; @@ -188,22 +191,22 @@ int batadv_frag_reassemble_skb(struct sk_buff *skb, struct bat_priv *bat_priv, orig_node->last_frag_packet = jiffies;

if (list_empty(&orig_node->frag_list) && - frag_create_buffer(&orig_node->frag_list)) { + batadv_frag_create_buffer(&orig_node->frag_list)) { pr_debug("couldn't create frag buffer\n"); goto out; }

- tmp_frag_entry = frag_search_packet(&orig_node->frag_list, - unicast_packet); + tmp_frag_entry = batadv_frag_search_packet(&orig_node->frag_list, + unicast_packet);

if (!tmp_frag_entry) { - frag_create_entry(&orig_node->frag_list, skb); + batadv_frag_create_entry(&orig_node->frag_list, skb); ret = NET_RX_SUCCESS; goto out; }

- *new_skb = frag_merge_packet(&orig_node->frag_list, tmp_frag_entry, - skb); + *new_skb = batadv_frag_merge_packet(&orig_node->frag_list, + tmp_frag_entry, skb); /* if not, merge failed */ if (*new_skb) ret = NET_RX_SUCCESS; @@ -281,8 +284,8 @@ out: return ret; }

-static bool pull_and_fill_unicast(struct sk_buff *skb, int hdr_size, - struct orig_node *orig_node) +static bool batadv_pull_and_fill_unicast(struct sk_buff *skb, int hdr_size, + struct orig_node *orig_node) { struct unicast_packet *unicast_packet;

@@ -304,11 +307,11 @@ static bool pull_and_fill_unicast(struct sk_buff *skb, int hdr_size, return true; }

-static bool prepare_unicast_packet(struct sk_buff *skb, - struct orig_node *orig_node) +static bool batadv_prepare_unicast_packet(struct sk_buff *skb, + struct orig_node *orig_node) { - return pull_and_fill_unicast(skb, sizeof(struct unicast_packet), - orig_node); + return batadv_pull_and_fill_unicast(skb, sizeof(struct unicast_packet), + orig_node); }

bool batadv_prepare_unicast_4addr_packet(struct bat_priv *bat_priv, @@ -328,8 +331,8 @@ bool batadv_prepare_unicast_4addr_packet(struct bat_priv *bat_priv, * We can do that because the first member of the unicast_4addr_packet * is of type struct unicast_packet */ - if (!pull_and_fill_unicast(skb, sizeof(*unicast_4addr_packet), - orig_node)) + if (!batadv_pull_and_fill_unicast(skb, sizeof(*unicast_4addr_packet), + orig_node)) goto out;

unicast_4addr_packet = (struct unicast_4addr_packet *)skb->data; @@ -379,7 +382,7 @@ find_router:

switch (packet_type) { case BAT_UNICAST: - prepare_unicast_packet(skb, orig_node); + batadv_prepare_unicast_packet(skb, orig_node); break; case BAT_UNICAST_4ADDR: batadv_prepare_unicast_4addr_packet(bat_priv, skb, orig_node,