summaryrefslogtreecommitdiffstats
path: root/net/batman-adv/soft-interface.h
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 02:09:38 +0200
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 22:15:28 +0200
commit04b482a21aaf22cf5b327fb6a3fba6fdc8cb3de9 (patch)
tree4035e2c89d47a961045c01d98d7bb4588478b86a /net/batman-adv/soft-interface.h
parent9455e34cb2ded22e01abb6daa65ba1caeed8d7fe (diff)
downloadlinux-04b482a21aaf22cf5b327fb6a3fba6fdc8cb3de9.tar.gz
linux-04b482a21aaf22cf5b327fb6a3fba6fdc8cb3de9.tar.bz2
linux-04b482a21aaf22cf5b327fb6a3fba6fdc8cb3de9.zip
batman-adv: Prefix soft-interface 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/soft-interface.h')
-rw-r--r--net/batman-adv/soft-interface.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h
index 020300673884..7e2bfafbcb79 100644
--- a/net/batman-adv/soft-interface.h
+++ b/net/batman-adv/soft-interface.h
@@ -22,12 +22,11 @@
#ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_
#define _NET_BATMAN_ADV_SOFT_INTERFACE_H_
-int my_skb_head_push(struct sk_buff *skb, unsigned int len);
-void interface_rx(struct net_device *soft_iface,
- struct sk_buff *skb, struct hard_iface *recv_if,
- int hdr_size);
-struct net_device *softif_create(const char *name);
-void softif_destroy(struct net_device *soft_iface);
-int softif_is_valid(const struct net_device *net_dev);
+int batadv_skb_head_push(struct sk_buff *skb, unsigned int len);
+void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb,
+ struct hard_iface *recv_if, int hdr_size);
+struct net_device *batadv_softif_create(const char *name);
+void batadv_softif_destroy(struct net_device *soft_iface);
+int batadv_softif_is_valid(const struct net_device *net_dev);
#endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */