The following commit has been merged in the master branch: commit 34f20d6a6490fc2750ac0afac4121fd91499946e Author: Sven Eckelmann sven@narfation.org Date: Fri May 18 17:16:13 2012 +0200

batman-adv: Prefix bat_sysfs 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.

This was actually part of patch used to create the commit 98881e49493eb1a6ae2330d861386432064b2222.

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

This is the alternative version of this patch... that keeps the functionality for ELP

bat_sysfs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bat_sysfs.c b/bat_sysfs.c index 336a61d..07fde83 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -123,8 +123,9 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \

#define BAT_ATTR_HIF_STORE_UINT(_name, _min, _max, _post_func) \ -ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ - char *buff, size_t count) \ +ssize_t batadv_store_##_name(struct kobject *kobj, \ + struct attribute *attr, char *buff, \ + size_t count) \ { \ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ struct hard_iface *hard_iface; \ @@ -142,8 +143,8 @@ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ }

#define BAT_ATTR_HIF_SHOW_UINT(_name) \ -ssize_t show_##_name(struct kobject *kobj, \ - struct attribute *attr, char *buff) \ +ssize_t batadv_show_##_name(struct kobject *kobj, \ + struct attribute *attr, char *buff) \ { \ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ struct hard_iface *hard_iface; \