Commit 9563877e authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix hard-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: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent 84d5e5e0

net/batman-adv/bat_sysfs.c

+11 −9
Original line number Diff line number Diff line
@@ -122,9 +122,10 @@ ssize_t store_##_name(struct kobject *kobj, struct attribute *attr, \ 
		      char *buff, size_t count)				\

{									\

	struct net_device *net_dev = kobj_to_netdev(kobj);		\

	struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);	\

	struct hard_iface *hard_iface;					\

	ssize_t length;							\

									\

	hard_iface = batadv_hardif_get_by_netdev(net_dev);		\

	if (!hard_iface)						\

		return 0;						\

									\
@@ -140,9 +141,10 @@ ssize_t show_##_name(struct kobject *kobj, \ 
		     struct attribute *attr, char *buff)		\

{									\

	struct net_device *net_dev = kobj_to_netdev(kobj);		\

	struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);	\

	struct hard_iface *hard_iface;					\

	ssize_t length;							\

									\

	hard_iface = batadv_hardif_get_by_netdev(net_dev);		\

	if (!hard_iface)						\

		return 0;						\

									\
@@ -433,7 +435,7 @@ BAT_ATTR_SIF_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); 
#ifdef CONFIG_BATMAN_ADV_BLA

BAT_ATTR_SIF_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL);

#endif

BAT_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu);

BAT_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu);

BAT_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);

static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode);

static BAT_ATTR(routing_algo, S_IRUGO, show_bat_algo, NULL);
@@ -523,7 +525,7 @@ static ssize_t show_mesh_iface(struct kobject *kobj, struct attribute *attr, 
			       char *buff)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);

	struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);

	ssize_t length;



	if (!hard_iface)
@@ -541,7 +543,7 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, 
				char *buff, size_t count)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);

	struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);

	int status_tmp = -1;

	int ret = count;
@@ -576,15 +578,15 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, 
	}



	if (status_tmp == IF_NOT_IN_USE) {

		hardif_disable_interface(hard_iface);

		batadv_hardif_disable_interface(hard_iface);

		goto unlock;

	}



	/* if the interface already is in use */

	if (hard_iface->if_status != IF_NOT_IN_USE)

		hardif_disable_interface(hard_iface);

		batadv_hardif_disable_interface(hard_iface);



	ret = hardif_enable_interface(hard_iface, buff);

	ret = batadv_hardif_enable_interface(hard_iface, buff);



unlock:

	rtnl_unlock();
@@ -597,7 +599,7 @@ static ssize_t show_iface_status(struct kobject *kobj, struct attribute *attr, 
				 char *buff)

{

	struct net_device *net_dev = kobj_to_netdev(kobj);

	struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);

	struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);

	ssize_t length;



	if (!hard_iface)

net/batman-adv/hard-interface.c

+16 −16
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#include <linux/if_arp.h>



void hardif_free_rcu(struct rcu_head *rcu)

void batadv_hardif_free_rcu(struct rcu_head *rcu)

{

	struct hard_iface *hard_iface;
@@ -41,7 +41,7 @@ void hardif_free_rcu(struct rcu_head *rcu) 
	kfree(hard_iface);

}



struct hard_iface *hardif_get_by_netdev(const struct net_device *net_dev)

struct hard_iface *batadv_hardif_get_by_netdev(const struct net_device *net_dev)

{

	struct hard_iface *hard_iface;
@@ -180,7 +180,7 @@ static void check_known_mac_addr(const struct net_device *net_dev) 
	rcu_read_unlock();

}



int hardif_min_mtu(struct net_device *soft_iface)

int batadv_hardif_min_mtu(struct net_device *soft_iface)

{

	const struct bat_priv *bat_priv = netdev_priv(soft_iface);

	const struct hard_iface *hard_iface;
@@ -209,11 +209,11 @@ out: 
}



/* adjusts the MTU if a new interface with a smaller MTU appeared. */

void update_min_mtu(struct net_device *soft_iface)

void batadv_update_min_mtu(struct net_device *soft_iface)

{

	int min_mtu;



	min_mtu = hardif_min_mtu(soft_iface);

	min_mtu = batadv_hardif_min_mtu(soft_iface);

	if (soft_iface->mtu != min_mtu)

		soft_iface->mtu = min_mtu;

}
@@ -242,7 +242,7 @@ static void hardif_activate_interface(struct hard_iface *hard_iface) 
	bat_info(hard_iface->soft_iface, "Interface activated: %s\n",

		 hard_iface->net_dev->name);



	update_min_mtu(hard_iface->soft_iface);

	batadv_update_min_mtu(hard_iface->soft_iface);



out:

	if (primary_if)
@@ -260,10 +260,10 @@ static void hardif_deactivate_interface(struct hard_iface *hard_iface) 
	bat_info(hard_iface->soft_iface, "Interface deactivated: %s\n",

		 hard_iface->net_dev->name);



	update_min_mtu(hard_iface->soft_iface);

	batadv_update_min_mtu(hard_iface->soft_iface);

}



int hardif_enable_interface(struct hard_iface *hard_iface,

int batadv_hardif_enable_interface(struct hard_iface *hard_iface,

				   const char *iface_name)

{

	struct bat_priv *bat_priv;
@@ -357,7 +357,7 @@ err: 
	return ret;

}



void hardif_disable_interface(struct hard_iface *hard_iface)

void batadv_hardif_disable_interface(struct hard_iface *hard_iface)

{

	struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);

	struct hard_iface *primary_if = NULL;
@@ -461,7 +461,7 @@ static void hardif_remove_interface(struct hard_iface *hard_iface) 


	/* first deactivate interface */

	if (hard_iface->if_status != IF_NOT_IN_USE)

		hardif_disable_interface(hard_iface);

		batadv_hardif_disable_interface(hard_iface);



	if (hard_iface->if_status != IF_NOT_IN_USE)

		return;
@@ -471,7 +471,7 @@ static void hardif_remove_interface(struct hard_iface *hard_iface) 
	hardif_free_ref(hard_iface);

}



void hardif_remove_interfaces(void)

void batadv_hardif_remove_interfaces(void)

{

	struct hard_iface *hard_iface, *hard_iface_tmp;
@@ -488,7 +488,7 @@ static int hard_if_event(struct notifier_block *this, 
			 unsigned long event, void *ptr)

{

	struct net_device *net_dev = ptr;

	struct hard_iface *hard_iface = hardif_get_by_netdev(net_dev);

	struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);

	struct hard_iface *primary_if = NULL;

	struct bat_priv *bat_priv;
@@ -513,7 +513,7 @@ static int hard_if_event(struct notifier_block *this, 
		break;

	case NETDEV_CHANGEMTU:

		if (hard_iface->soft_iface)

			update_min_mtu(hard_iface->soft_iface);

			batadv_update_min_mtu(hard_iface->soft_iface);

		break;

	case NETDEV_CHANGEADDR:

		if (hard_iface->if_status == IF_NOT_IN_USE)
@@ -545,7 +545,7 @@ out: 


/* This function returns true if the interface represented by ifindex is a

 * 802.11 wireless device */

bool is_wifi_iface(int ifindex)

bool batadv_is_wifi_iface(int ifindex)

{

	struct net_device *net_device = NULL;

	bool ret = false;
@@ -573,6 +573,6 @@ out: 
	return ret;

}



struct notifier_block hard_if_notifier = {

struct notifier_block batadv_hard_if_notifier = {

	.notifier_call = hard_if_event,

};

net/batman-adv/hard-interface.h

+11 −11
Original line number Diff line number Diff line
@@ -31,23 +31,23 @@ enum hard_if_state { 
	IF_I_WANT_YOU

};



extern struct notifier_block hard_if_notifier;

extern struct notifier_block batadv_hard_if_notifier;



struct hard_iface*

hardif_get_by_netdev(const struct net_device *net_dev);

int hardif_enable_interface(struct hard_iface *hard_iface,

batadv_hardif_get_by_netdev(const struct net_device *net_dev);

int batadv_hardif_enable_interface(struct hard_iface *hard_iface,

				   const char *iface_name);

void hardif_disable_interface(struct hard_iface *hard_iface);

void hardif_remove_interfaces(void);

int hardif_min_mtu(struct net_device *soft_iface);

void update_min_mtu(struct net_device *soft_iface);

void hardif_free_rcu(struct rcu_head *rcu);

bool is_wifi_iface(int ifindex);

void batadv_hardif_disable_interface(struct hard_iface *hard_iface);

void batadv_hardif_remove_interfaces(void);

int batadv_hardif_min_mtu(struct net_device *soft_iface);

void batadv_update_min_mtu(struct net_device *soft_iface);

void batadv_hardif_free_rcu(struct rcu_head *rcu);

bool batadv_is_wifi_iface(int ifindex);



static inline void hardif_free_ref(struct hard_iface *hard_iface)

{

	if (atomic_dec_and_test(&hard_iface->refcount))

		call_rcu(&hard_iface->rcu, hardif_free_rcu);

		call_rcu(&hard_iface->rcu, batadv_hardif_free_rcu);

}



static inline struct hard_iface *primary_if_get_selected(

net/batman-adv/main.c

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int __init batman_init(void) 
	bat_socket_init();

	batadv_debugfs_init();



	register_netdevice_notifier(&hard_if_notifier);

	register_netdevice_notifier(&batadv_hard_if_notifier);



	pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n",

		SOURCE_VERSION, COMPAT_VERSION);
@@ -79,8 +79,8 @@ static int __init batman_init(void) 
static void __exit batman_exit(void)

{

	batadv_debugfs_destroy();

	unregister_netdevice_notifier(&hard_if_notifier);

	hardif_remove_interfaces();

	unregister_netdevice_notifier(&batadv_hard_if_notifier);

	batadv_hardif_remove_interfaces();



	flush_workqueue(bat_event_workqueue);

	destroy_workqueue(bat_event_workqueue);

net/batman-adv/soft-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) 
static int interface_change_mtu(struct net_device *dev, int new_mtu)

{

	/* check ranges */

	if ((new_mtu < 68) || (new_mtu > hardif_min_mtu(dev)))

	if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev)))

		return -EINVAL;



	dev->mtu = new_mtu;