Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e34819e authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix remaining function like macros with batadv_ 



Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent ee11ad61

net/batman-adv/bat_debugfs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ int batadv_debugfs_add_meshif(struct net_device *dev) 
					  bat_priv->debug_dir,

					  bat_priv->debug_dir,

					  dev, &(*bat_debug)->fops);

					  dev, &(*bat_debug)->fops);

		if (!file) {

		if (!file) {

			bat_err(dev, "Can't add debugfs file: %s/%s\n",

			batadv_err(dev, "Can't add debugfs file: %s/%s\n",

				   dev->name, ((*bat_debug)->attr).name);

				   dev->name, ((*bat_debug)->attr).name);

			goto rem_attr;

			goto rem_attr;

		}

		}

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -373,7 +373,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, 




	/* own packet should always be scheduled */

	/* own packet should always be scheduled */

	if (!own_packet) {

	if (!own_packet) {

		if (!atomic_dec_not_zero(&bat_priv->batman_queue_left)) {

		if (!batadv_atomic_dec_not_zero(&bat_priv->batman_queue_left)) {

			batadv_dbg(DBG_BATMAN, bat_priv,

			batadv_dbg(DBG_BATMAN, bat_priv,

				   "batman packet queue full\n");

				   "batman packet queue full\n");

			goto out;

			goto out;

net/batman-adv/bat_sysfs.c

+44 −37
Original line number Original line Diff line number Diff line
@@ -191,8 +191,7 @@ static int batadv_store_bool_attr(char *buff, size_t count, 
		enabled = 0;

		enabled = 0;





	if (enabled < 0) {

	if (enabled < 0) {

		bat_info(net_dev,

		batadv_info(net_dev, "%s: Invalid parameter received: %s\n",

			 "%s: Invalid parameter received: %s\n",

			    attr_name, buff);

			    attr_name, buff);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -200,7 +199,7 @@ static int batadv_store_bool_attr(char *buff, size_t count, 
	if (atomic_read(attr) == enabled)

	if (atomic_read(attr) == enabled)

		return count;

		return count;





	bat_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name,

	batadv_info(net_dev, "%s: Changing from: %s to: %s\n", attr_name,

		    atomic_read(attr) == 1 ? "enabled" : "disabled",

		    atomic_read(attr) == 1 ? "enabled" : "disabled",

		    enabled == 1 ? "enabled" : "disabled");

		    enabled == 1 ? "enabled" : "disabled");
@@ -235,20 +234,19 @@ static int batadv_store_uint_attr(const char *buff, size_t count, 




	ret = kstrtoul(buff, 10, &uint_val);

	ret = kstrtoul(buff, 10, &uint_val);

	if (ret) {

	if (ret) {

		bat_info(net_dev,

		batadv_info(net_dev, "%s: Invalid parameter received: %s\n",

			 "%s: Invalid parameter received: %s\n",

			    attr_name, buff);

			    attr_name, buff);

		return -EINVAL;

		return -EINVAL;

	}

	}





	if (uint_val < min) {

	if (uint_val < min) {

		bat_info(net_dev, "%s: Value is too small: %lu min: %u\n",

		batadv_info(net_dev, "%s: Value is too small: %lu min: %u\n",

			    attr_name, uint_val, min);

			    attr_name, uint_val, min);

		return -EINVAL;

		return -EINVAL;

	}

	}





	if (uint_val > max) {

	if (uint_val > max) {

		bat_info(net_dev, "%s: Value is too big: %lu max: %u\n",

		batadv_info(net_dev, "%s: Value is too big: %lu max: %u\n",

			    attr_name, uint_val, max);

			    attr_name, uint_val, max);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -256,7 +254,7 @@ static int batadv_store_uint_attr(const char *buff, size_t count, 
	if (atomic_read(attr) == uint_val)

	if (atomic_read(attr) == uint_val)

		return count;

		return count;





	bat_info(net_dev, "%s: Changing from: %i to: %lu\n",

	batadv_info(net_dev, "%s: Changing from: %i to: %lu\n",

		    attr_name, atomic_read(attr), uint_val);

		    attr_name, atomic_read(attr), uint_val);





	atomic_set(attr, uint_val);

	atomic_set(attr, uint_val);
@@ -299,6 +297,7 @@ static ssize_t batadv_store_vis_mode(struct kobject *kobj, 
	struct bat_priv *bat_priv = netdev_priv(net_dev);

	struct bat_priv *bat_priv = netdev_priv(net_dev);

	unsigned long val;

	unsigned long val;

	int ret, vis_mode_tmp = -1;

	int ret, vis_mode_tmp = -1;

	const char *old_mode, *new_mode;





	ret = kstrtoul(buff, 10, &val);

	ret = kstrtoul(buff, 10, &val);
@@ -315,7 +314,7 @@ static ssize_t batadv_store_vis_mode(struct kobject *kobj, 
		if (buff[count - 1] == '\n')

		if (buff[count - 1] == '\n')

			buff[count - 1] = '\0';

			buff[count - 1] = '\0';





		bat_info(net_dev,

		batadv_info(net_dev,

			    "Invalid parameter for 'vis mode' setting received: %s\n",

			    "Invalid parameter for 'vis mode' setting received: %s\n",

			    buff);

			    buff);

		return -EINVAL;

		return -EINVAL;
@@ -324,10 +323,18 @@ static ssize_t batadv_store_vis_mode(struct kobject *kobj, 
	if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)

	if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)

		return count;

		return count;





	bat_info(net_dev, "Changing vis mode from: %s to: %s\n",

	if (atomic_read(&bat_priv->vis_mode) == VIS_TYPE_CLIENT_UPDATE)

		 atomic_read(&bat_priv->vis_mode) == VIS_TYPE_CLIENT_UPDATE ?

		old_mode =  "client";

		 "client" : "server", vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE ?

	else

		 "client" : "server");

		old_mode = "server";



	if (vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE)

		new_mode =  "client";

	else

		new_mode = "server";



	batadv_info(net_dev, "Changing vis mode from: %s to: %s\n", old_mode,

		    new_mode);





	atomic_set(&bat_priv->vis_mode, (unsigned int)vis_mode_tmp);

	atomic_set(&bat_priv->vis_mode, (unsigned int)vis_mode_tmp);

	return count;

	return count;
@@ -391,7 +398,7 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj, 
		gw_mode_tmp = GW_MODE_SERVER;

		gw_mode_tmp = GW_MODE_SERVER;





	if (gw_mode_tmp < 0) {

	if (gw_mode_tmp < 0) {

		bat_info(net_dev,

		batadv_info(net_dev,

			    "Invalid parameter for 'gw mode' setting received: %s\n",

			    "Invalid parameter for 'gw mode' setting received: %s\n",

			    buff);

			    buff);

		return -EINVAL;

		return -EINVAL;
@@ -412,7 +419,7 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj, 
		break;

		break;

	}

	}





	bat_info(net_dev, "Changing gw mode from: %s to: %s\n",

	batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",

		    curr_gw_mode_str, buff);

		    curr_gw_mode_str, buff);





	batadv_gw_deselect(bat_priv);

	batadv_gw_deselect(bat_priv);
@@ -500,7 +507,7 @@ int batadv_sysfs_add_meshif(struct net_device *dev) 
	bat_priv->mesh_obj = kobject_create_and_add(SYSFS_IF_MESH_SUBDIR,

	bat_priv->mesh_obj = kobject_create_and_add(SYSFS_IF_MESH_SUBDIR,

						    batif_kobject);

						    batif_kobject);

	if (!bat_priv->mesh_obj) {

	if (!bat_priv->mesh_obj) {

		bat_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,

		batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,

			   SYSFS_IF_MESH_SUBDIR);

			   SYSFS_IF_MESH_SUBDIR);

		goto out;

		goto out;

	}

	}
@@ -509,7 +516,7 @@ int batadv_sysfs_add_meshif(struct net_device *dev) 
		err = sysfs_create_file(bat_priv->mesh_obj,

		err = sysfs_create_file(bat_priv->mesh_obj,

					&((*bat_attr)->attr));

					&((*bat_attr)->attr));

		if (err) {

		if (err) {

			bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",

			batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",

				   dev->name, SYSFS_IF_MESH_SUBDIR,

				   dev->name, SYSFS_IF_MESH_SUBDIR,

				   ((*bat_attr)->attr).name);

				   ((*bat_attr)->attr).name);

			goto rem_attr;

			goto rem_attr;
@@ -669,7 +676,7 @@ int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev) 
						    hardif_kobject);

						    hardif_kobject);





	if (!*hardif_obj) {

	if (!*hardif_obj) {

		bat_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,

		batadv_err(dev, "Can't add sysfs directory: %s/%s\n", dev->name,

			   SYSFS_IF_BAT_SUBDIR);

			   SYSFS_IF_BAT_SUBDIR);

		goto out;

		goto out;

	}

	}
@@ -677,7 +684,7 @@ int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev) 
	for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr) {

	for (bat_attr = batadv_batman_attrs; *bat_attr; ++bat_attr) {

		err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));

		err = sysfs_create_file(*hardif_obj, &((*bat_attr)->attr));

		if (err) {

		if (err) {

			bat_err(dev, "Can't add sysfs file: %s/%s/%s\n",

			batadv_err(dev, "Can't add sysfs file: %s/%s/%s\n",

				   dev->name, SYSFS_IF_BAT_SUBDIR,

				   dev->name, SYSFS_IF_BAT_SUBDIR,

				   ((*bat_attr)->attr).name);

				   ((*bat_attr)->attr).name);

			goto rem_attr;

			goto rem_attr;

net/batman-adv/gateway_client.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -197,7 +197,7 @@ void batadv_gw_election(struct bat_priv *bat_priv) 
	if (atomic_read(&bat_priv->gw_mode) != GW_MODE_CLIENT)

	if (atomic_read(&bat_priv->gw_mode) != GW_MODE_CLIENT)

		goto out;

		goto out;





	if (!atomic_dec_not_zero(&bat_priv->gw_reselect))

	if (!batadv_atomic_dec_not_zero(&bat_priv->gw_reselect))

		goto out;

		goto out;





	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);

	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);

net/batman-adv/gateway_common.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, 




	ret = kstrtol(buff, 10, &ldown);

	ret = kstrtol(buff, 10, &ldown);

	if (ret) {

	if (ret) {

		bat_err(net_dev,

		batadv_err(net_dev,

			   "Download speed of gateway mode invalid: %s\n",

			   "Download speed of gateway mode invalid: %s\n",

			   buff);

			   buff);

		return false;

		return false;
@@ -122,7 +122,7 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, 




		ret = kstrtol(slash_ptr + 1, 10, &lup);

		ret = kstrtol(slash_ptr + 1, 10, &lup);

		if (ret) {

		if (ret) {

			bat_err(net_dev,

			batadv_err(net_dev,

				   "Upload speed of gateway mode invalid: %s\n",

				   "Upload speed of gateway mode invalid: %s\n",

				   slash_ptr + 1);

				   slash_ptr + 1);

			return false;

			return false;
@@ -164,7 +164,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, 
		return count;

		return count;





	batadv_gw_deselect(bat_priv);

	batadv_gw_deselect(bat_priv);

	bat_info(net_dev,

	batadv_info(net_dev,

		    "Changing gateway bandwidth from: '%i' to: '%ld' (propagating: %d%s/%d%s)\n",

		    "Changing gateway bandwidth from: '%i' to: '%ld' (propagating: %d%s/%d%s)\n",

		    atomic_read(&bat_priv->gw_bandwidth), gw_bandwidth_tmp,

		    atomic_read(&bat_priv->gw_bandwidth), gw_bandwidth_tmp,

		    (down > 2048 ? down / 1024 : down),

		    (down > 2048 ? down / 1024 : down),