aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/unicast.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-11 20:09:37 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 16:15:26 -0400
commit9455e34cb2ded22e01abb6daa65ba1caeed8d7fe (patch)
tree56ac8dc90b5bcddcace5eea383b266e9654ecb2d /net/batman-adv/unicast.c
parent30d3c5113f9a3f162d65d01b771b122afac0ce79 (diff)
batman-adv: Prefix send non-static functions with batadv_
batman-adv can be compiled as part of the kernel instead of an module. In that case the linker will see all non-static symbols of batman-adv and all other non-static symbols of the kernel. This could lead to symbol collisions. A prefix for the batman-adv symbols that defines their private namespace avoids such a problem. Reported-by: David Miller <davem@davemloft.net> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/unicast.c')
-rw-r--r--net/batman-adv/unicast.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 894c6a416dac..6bb3bb9f843f 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -268,8 +268,8 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
268 frag1->seqno = htons(seqno - 1); 268 frag1->seqno = htons(seqno - 1);
269 frag2->seqno = htons(seqno); 269 frag2->seqno = htons(seqno);
270 270
271 send_skb_packet(skb, hard_iface, dstaddr); 271 batadv_send_skb_packet(skb, hard_iface, dstaddr);
272 send_skb_packet(frag_skb, hard_iface, dstaddr); 272 batadv_send_skb_packet(frag_skb, hard_iface, dstaddr);
273 ret = NET_RX_SUCCESS; 273 ret = NET_RX_SUCCESS;
274 goto out; 274 goto out;
275 275
@@ -348,7 +348,7 @@ find_router:
348 goto out; 348 goto out;
349 } 349 }
350 350
351 send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); 351 batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);
352 ret = 0; 352 ret = 0;
353 goto out; 353 goto out;
354 354