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

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

batman-adv: Prefix hard-interface enum with BATADV_ 



Reported-by: default avatarMartin Hundebøll <martin@hundeboll.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent cd646ab1

net/batman-adv/bat_iv_ogm.c

+3 −3
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet, 
	struct batman_ogm_packet *batman_ogm_packet;

	struct sk_buff *skb;



	if (hard_iface->if_status != IF_ACTIVE)

	if (hard_iface->if_status != BATADV_IF_ACTIVE)

		return;



	packet_num = 0;
@@ -238,7 +238,7 @@ static void batadv_iv_ogm_emit(struct forw_packet *forw_packet) 
	soft_iface = forw_packet->if_incoming->soft_iface;

	bat_priv = netdev_priv(soft_iface);



	if (forw_packet->if_incoming->if_status != IF_ACTIVE)

	if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE)

		goto out;



	primary_if = batadv_primary_if_get_selected(bat_priv);
@@ -1017,7 +1017,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 


	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

		if (hard_iface->if_status != IF_ACTIVE)

		if (hard_iface->if_status != BATADV_IF_ACTIVE)

			continue;



		if (hard_iface->soft_iface != if_incoming->soft_iface)

net/batman-adv/bat_sysfs.c

+16 −11
Original line number Diff line number Diff line
@@ -559,12 +559,17 @@ static ssize_t batadv_show_mesh_iface(struct kobject *kobj, 
	struct net_device *net_dev = batadv_kobj_to_netdev(kobj);

	struct hard_iface *hard_iface = batadv_hardif_get_by_netdev(net_dev);

	ssize_t length;

	const char *ifname;



	if (!hard_iface)

		return 0;



	length = sprintf(buff, "%s\n", hard_iface->if_status == IF_NOT_IN_USE ?

			 "none" : hard_iface->soft_iface->name);

	if (hard_iface->if_status == BATADV_IF_NOT_IN_USE)

		ifname =  "none";

	else

		ifname = hard_iface->soft_iface->name;



	length = sprintf(buff, "%s\n", ifname);



	batadv_hardif_free_ref(hard_iface);
@@ -594,9 +599,9 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, 
	}



	if (strncmp(buff, "none", 4) == 0)

		status_tmp = IF_NOT_IN_USE;

		status_tmp = BATADV_IF_NOT_IN_USE;

	else

		status_tmp = IF_I_WANT_YOU;

		status_tmp = BATADV_IF_I_WANT_YOU;



	if (hard_iface->if_status == status_tmp)

		goto out;
@@ -610,13 +615,13 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, 
		goto out;

	}



	if (status_tmp == IF_NOT_IN_USE) {

	if (status_tmp == BATADV_IF_NOT_IN_USE) {

		batadv_hardif_disable_interface(hard_iface);

		goto unlock;

	}



	/* if the interface already is in use */

	if (hard_iface->if_status != IF_NOT_IN_USE)

	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)

		batadv_hardif_disable_interface(hard_iface);



	ret = batadv_hardif_enable_interface(hard_iface, buff);
@@ -639,19 +644,19 @@ static ssize_t batadv_show_iface_status(struct kobject *kobj, 
		return 0;



	switch (hard_iface->if_status) {

	case IF_TO_BE_REMOVED:

	case BATADV_IF_TO_BE_REMOVED:

		length = sprintf(buff, "disabling\n");

		break;

	case IF_INACTIVE:

	case BATADV_IF_INACTIVE:

		length = sprintf(buff, "inactive\n");

		break;

	case IF_ACTIVE:

	case BATADV_IF_ACTIVE:

		length = sprintf(buff, "active\n");

		break;

	case IF_TO_BE_ACTIVATED:

	case BATADV_IF_TO_BE_ACTIVATED:

		length = sprintf(buff, "enabling\n");

		break;

	case IF_NOT_IN_USE:

	case BATADV_IF_NOT_IN_USE:

	default:

		length = sprintf(buff, "not in use\n");

		break;

net/batman-adv/bridge_loop_avoidance.c

+1 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
		goto out;

	}



	if (primary_if->if_status != IF_ACTIVE) {

	if (primary_if->if_status != BATADV_IF_ACTIVE) {

		ret = seq_printf(seq,

				 "BATMAN mesh %s disabled - primary interface not active\n",

				 net_dev->name);

net/batman-adv/gateway_client.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) 
		goto out;

	}



	if (primary_if->if_status != IF_ACTIVE) {

	if (primary_if->if_status != BATADV_IF_ACTIVE) {

		ret = seq_printf(seq,

				 "BATMAN mesh %s disabled - primary interface not active\n",

				 net_dev->name);

net/batman-adv/hard-interface.c

+20 −20
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ batadv_hardif_get_active(const struct net_device *soft_iface) 
		if (hard_iface->soft_iface != soft_iface)

			continue;



		if (hard_iface->if_status == IF_ACTIVE &&

		if (hard_iface->if_status == BATADV_IF_ACTIVE &&

		    atomic_inc_not_zero(&hard_iface->refcount))

			goto out;

	}
@@ -157,8 +157,8 @@ static void batadv_check_known_mac_addr(const struct net_device *net_dev) 


	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

		if ((hard_iface->if_status != IF_ACTIVE) &&

		    (hard_iface->if_status != IF_TO_BE_ACTIVATED))

		if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&

		    (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))

			continue;



		if (hard_iface->net_dev == net_dev)
@@ -189,8 +189,8 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface) 


	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

		if ((hard_iface->if_status != IF_ACTIVE) &&

		    (hard_iface->if_status != IF_TO_BE_ACTIVATED))

		if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&

		    (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))

			continue;



		if (hard_iface->soft_iface != soft_iface)
@@ -220,13 +220,13 @@ static void batadv_hardif_activate_interface(struct hard_iface *hard_iface) 
	struct bat_priv *bat_priv;

	struct hard_iface *primary_if = NULL;



	if (hard_iface->if_status != IF_INACTIVE)

	if (hard_iface->if_status != BATADV_IF_INACTIVE)

		goto out;



	bat_priv = netdev_priv(hard_iface->soft_iface);



	bat_priv->bat_algo_ops->bat_iface_update_mac(hard_iface);

	hard_iface->if_status = IF_TO_BE_ACTIVATED;

	hard_iface->if_status = BATADV_IF_TO_BE_ACTIVATED;



	/* the first active interface becomes our primary interface or

	 * the next active interface after the old primary interface was removed
@@ -247,11 +247,11 @@ static void batadv_hardif_activate_interface(struct hard_iface *hard_iface) 


static void batadv_hardif_deactivate_interface(struct hard_iface *hard_iface)

{

	if ((hard_iface->if_status != IF_ACTIVE) &&

	    (hard_iface->if_status != IF_TO_BE_ACTIVATED))

	if ((hard_iface->if_status != BATADV_IF_ACTIVE) &&

	    (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED))

		return;



	hard_iface->if_status = IF_INACTIVE;

	hard_iface->if_status = BATADV_IF_INACTIVE;



	batadv_info(hard_iface->soft_iface, "Interface deactivated: %s\n",

		    hard_iface->net_dev->name);
@@ -267,7 +267,7 @@ int batadv_hardif_enable_interface(struct hard_iface *hard_iface, 
	__be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);

	int ret;



	if (hard_iface->if_status != IF_NOT_IN_USE)

	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)

		goto out;



	if (!atomic_inc_not_zero(&hard_iface->refcount))
@@ -308,7 +308,7 @@ int batadv_hardif_enable_interface(struct hard_iface *hard_iface, 


	hard_iface->if_num = bat_priv->num_ifaces;

	bat_priv->num_ifaces++;

	hard_iface->if_status = IF_INACTIVE;

	hard_iface->if_status = BATADV_IF_INACTIVE;

	batadv_orig_hash_add_if(hard_iface, bat_priv->num_ifaces);



	hard_iface->batman_adv_ptype.type = ethertype;
@@ -359,10 +359,10 @@ 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;



	if (hard_iface->if_status == IF_ACTIVE)

	if (hard_iface->if_status == BATADV_IF_ACTIVE)

		batadv_hardif_deactivate_interface(hard_iface);



	if (hard_iface->if_status != IF_INACTIVE)

	if (hard_iface->if_status != BATADV_IF_INACTIVE)

		goto out;



	batadv_info(hard_iface->soft_iface, "Removing interface: %s\n",
@@ -384,7 +384,7 @@ void batadv_hardif_disable_interface(struct hard_iface *hard_iface) 
	}



	bat_priv->bat_algo_ops->bat_iface_disable(hard_iface);

	hard_iface->if_status = IF_NOT_IN_USE;

	hard_iface->if_status = BATADV_IF_NOT_IN_USE;



	/* delete all references to this hard_iface */

	batadv_purge_orig_ref(bat_priv);
@@ -428,7 +428,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) 
	hard_iface->if_num = -1;

	hard_iface->net_dev = net_dev;

	hard_iface->soft_iface = NULL;

	hard_iface->if_status = IF_NOT_IN_USE;

	hard_iface->if_status = BATADV_IF_NOT_IN_USE;

	INIT_LIST_HEAD(&hard_iface->list);

	/* extra reference for return */

	atomic_set(&hard_iface->refcount, 2);
@@ -457,13 +457,13 @@ static void batadv_hardif_remove_interface(struct hard_iface *hard_iface) 
	ASSERT_RTNL();



	/* first deactivate interface */

	if (hard_iface->if_status != IF_NOT_IN_USE)

	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)

		batadv_hardif_disable_interface(hard_iface);



	if (hard_iface->if_status != IF_NOT_IN_USE)

	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)

		return;



	hard_iface->if_status = IF_TO_BE_REMOVED;

	hard_iface->if_status = BATADV_IF_TO_BE_REMOVED;

	batadv_sysfs_del_hardif(&hard_iface->hardif_obj);

	batadv_hardif_free_ref(hard_iface);

}
@@ -513,7 +513,7 @@ static int batadv_hard_if_event(struct notifier_block *this, 
			batadv_update_min_mtu(hard_iface->soft_iface);

		break;

	case NETDEV_CHANGEADDR:

		if (hard_iface->if_status == IF_NOT_IN_USE)

		if (hard_iface->if_status == BATADV_IF_NOT_IN_USE)

			goto hardif_put;



		batadv_check_known_mac_addr(hard_iface->net_dev);