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

Commit 74ef1153 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Sven Eckelmann
Browse files

batman-adv: remove unused parameters 



Some function parameters are obsolete now and can be removed.

Reported-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent ae361ce1

net/batman-adv/originator.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static bool purge_orig_node(struct bat_priv *bat_priv, 
				      orig_node->hna_buff_len);

			/* update bonding candidates, we could have lost

			 * some candidates. */

			update_bonding_candidates(bat_priv, orig_node);

			update_bonding_candidates(orig_node);

		}

	}

net/batman-adv/routing.c

+6 −9
Original line number Diff line number Diff line
@@ -433,8 +433,7 @@ static char count_real_packets(struct ethhdr *ethhdr, 
}



/* copy primary address for bonding */

static void mark_bonding_address(struct bat_priv *bat_priv,

				 struct orig_node *orig_node,

static void mark_bonding_address(struct orig_node *orig_node,

				 struct orig_node *orig_neigh_node,

				 struct batman_packet *batman_packet)
@@ -447,8 +446,7 @@ static void mark_bonding_address(struct bat_priv *bat_priv, 
}



/* mark possible bond.candidates in the neighbor list */

void update_bonding_candidates(struct bat_priv *bat_priv,

			       struct orig_node *orig_node)

void update_bonding_candidates(struct orig_node *orig_node)

{

	int candidates;

	int interference_candidate;
@@ -730,9 +728,8 @@ void receive_bat_packet(struct ethhdr *ethhdr, 
		update_orig(bat_priv, orig_node, ethhdr, batman_packet,

			    if_incoming, hna_buff, hna_buff_len, is_duplicate);



	mark_bonding_address(bat_priv, orig_node,

			     orig_neigh_node, batman_packet);

	update_bonding_candidates(bat_priv, orig_node);

	mark_bonding_address(orig_node, orig_neigh_node, batman_packet);

	update_bonding_candidates(orig_node);



	/* is single hop (direct) neighbor */

	if (is_single_hop_neigh) {
@@ -866,7 +863,7 @@ static int recv_my_icmp_packet(struct bat_priv *bat_priv, 
}



static int recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,

				  struct sk_buff *skb, size_t icmp_len)

				  struct sk_buff *skb)

{

	struct orig_node *orig_node;

	struct icmp_packet *icmp_packet;
@@ -978,7 +975,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) 


	/* TTL exceeded */

	if (icmp_packet->ttl < 2)

		return recv_icmp_ttl_exceeded(bat_priv, skb, hdr_size);

		return recv_icmp_ttl_exceeded(bat_priv, skb);



	ret = NET_RX_DROP;

net/batman-adv/routing.h

+1 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if); 
int recv_bat_packet(struct sk_buff *skb, struct batman_if *recv_if);

struct neigh_node *find_router(struct bat_priv *bat_priv,

		struct orig_node *orig_node, struct batman_if *recv_if);

void update_bonding_candidates(struct bat_priv *bat_priv,

			       struct orig_node *orig_node);

void update_bonding_candidates(struct orig_node *orig_node);



#endif /* _NET_BATMAN_ADV_ROUTING_H_ */

net/batman-adv/send.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static unsigned long own_send_time(struct bat_priv *bat_priv) 
}



/* when do we schedule a forwarded packet to be sent */

static unsigned long forward_send_time(struct bat_priv *bat_priv)

static unsigned long forward_send_time(void)

{

	return jiffies + msecs_to_jiffies(random32() % (JITTER/2));

}
@@ -356,7 +356,7 @@ void schedule_forward_packet(struct orig_node *orig_node, 
	else

		batman_packet->flags &= ~DIRECTLINK;



	send_time = forward_send_time(bat_priv);

	send_time = forward_send_time();

	add_bat_packet_to_list(bat_priv,

			       (unsigned char *)batman_packet,

			       sizeof(struct batman_packet) + hna_buff_len,