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

Commit 30da63a6 authored by Marek Lindner's avatar Marek Lindner Committed by Antonio Quartulli
Browse files

batman-adv: consolidate duplicated primary_if checking code 



Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent f03a13a7

net/batman-adv/bridge_loop_avoidance.c

+6 −30
Original line number Diff line number Diff line
@@ -1585,23 +1585,11 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
	struct hlist_head *head;

	uint32_t i;

	bool is_own;

	int ret = 0;

	uint8_t *primary_addr;



	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (!primary_if) {

		ret = seq_printf(seq,

				 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",

				 net_dev->name);

		goto out;

	}



	if (primary_if->if_status != BATADV_IF_ACTIVE) {

		ret = seq_printf(seq,

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

				 net_dev->name);

	primary_if = batadv_seq_print_text_primary_if_get(seq);

	if (!primary_if)

		goto out;

	}



	primary_addr = primary_if->net_dev->dev_addr;

	seq_printf(seq,
@@ -1628,7 +1616,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

	return ret;

	return 0;

}



int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset)
@@ -1643,23 +1631,11 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
	int secs, msecs;

	uint32_t i;

	bool is_own;

	int ret = 0;

	uint8_t *primary_addr;



	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (!primary_if) {

		ret = seq_printf(seq,

				 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",

				 net_dev->name);

		goto out;

	}



	if (primary_if->if_status != BATADV_IF_ACTIVE) {

		ret = seq_printf(seq,

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

				 net_dev->name);

	primary_if = batadv_seq_print_text_primary_if_get(seq);

	if (!primary_if)

		goto out;

	}



	primary_addr = primary_if->net_dev->dev_addr;

	seq_printf(seq,
@@ -1693,5 +1669,5 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

	return ret;

	return 0;

}

net/batman-adv/gateway_client.c

+4 −15
Original line number Diff line number Diff line
@@ -477,22 +477,11 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) 
	struct batadv_hard_iface *primary_if;

	struct batadv_gw_node *gw_node;

	struct hlist_node *node;

	int gw_count = 0, ret = 0;

	int gw_count = 0;



	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (!primary_if) {

		ret = seq_printf(seq,

				 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",

				 net_dev->name);

	primary_if = batadv_seq_print_text_primary_if_get(seq);

	if (!primary_if)

		goto out;

	}



	if (primary_if->if_status != BATADV_IF_ACTIVE) {

		ret = seq_printf(seq,

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

				 net_dev->name);

		goto out;

	}



	seq_printf(seq,

		   "      %-12s (%s/%i) %17s [%10s]: gw_class ... [B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",
@@ -519,7 +508,7 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) 
out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

	return ret;

	return 0;

}



static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len)

net/batman-adv/main.c

+36 −0
Original line number Diff line number Diff line
@@ -188,6 +188,42 @@ int batadv_is_my_mac(const uint8_t *addr) 
	return 0;

}



/**

 * batadv_seq_print_text_primary_if_get - called from debugfs table printing

 *  function that requires the primary interface

 * @seq: debugfs table seq_file struct

 *

 * Returns primary interface if found or NULL otherwise.

 */

struct batadv_hard_iface *

batadv_seq_print_text_primary_if_get(struct seq_file *seq)

{

	struct net_device *net_dev = (struct net_device *)seq->private;

	struct batadv_priv *bat_priv = netdev_priv(net_dev);

	struct batadv_hard_iface *primary_if;



	primary_if = batadv_primary_if_get_selected(bat_priv);



	if (!primary_if) {

		seq_printf(seq,

			   "BATMAN mesh %s disabled - please specify interfaces to enable it\n",

			   net_dev->name);

		goto out;

	}



	if (primary_if->if_status == BATADV_IF_ACTIVE)

		goto out;



	seq_printf(seq,

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

		   net_dev->name);

	batadv_hardif_free_ref(primary_if);

	primary_if = NULL;



out:

	return primary_if;

}



static int batadv_recv_unhandled_packet(struct sk_buff *skb,

					struct batadv_hard_iface *recv_if)

{

net/batman-adv/main.h

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ void batadv_mesh_free(struct net_device *soft_iface); 
void batadv_inc_module_count(void);

void batadv_dec_module_count(void);

int batadv_is_my_mac(const uint8_t *addr);

struct batadv_hard_iface *

batadv_seq_print_text_primary_if_get(struct seq_file *seq);

int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,

			   struct packet_type *ptype,

			   struct net_device *orig_dev);

net/batman-adv/originator.c

+3 −16
Original line number Diff line number Diff line
@@ -415,23 +415,10 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset) 
	int last_seen_msecs;

	unsigned long last_seen_jiffies;

	uint32_t i;

	int ret = 0;



	primary_if = batadv_primary_if_get_selected(bat_priv);



	if (!primary_if) {

		ret = seq_printf(seq,

				 "BATMAN mesh %s disabled - please specify interfaces to enable it\n",

				 net_dev->name);

		goto out;

	}



	if (primary_if->if_status != BATADV_IF_ACTIVE) {

		ret = seq_printf(seq,

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

				 net_dev->name);

	primary_if = batadv_seq_print_text_primary_if_get(seq);

	if (!primary_if)

		goto out;

	}



	seq_printf(seq, "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%pM (%s)]\n",

		   BATADV_SOURCE_VERSION, primary_if->net_dev->name,
@@ -485,7 +472,7 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset) 
out:

	if (primary_if)

		batadv_hardif_free_ref(primary_if);

	return ret;

	return 0;

}



static int batadv_orig_node_add_if(struct batadv_orig_node *orig_node,