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

Commit 143d157c authored by Marek Lindner's avatar Marek Lindner Committed by Antonio Quartulli
Browse files

batman-adv: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag 



Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent 008a3744

net/batman-adv/bat_iv_ogm.c

+0 −3
Original line number Diff line number Diff line
@@ -361,7 +361,6 @@ batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface) 
	unsigned char *ogm_buff = hard_iface->bat_iv.ogm_buff;



	batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff;

	batadv_ogm_packet->flags = BATADV_PRIMARIES_FIRST_HOP;

	batadv_ogm_packet->ttl = BATADV_TTL;

}
@@ -842,8 +841,6 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, 
		   "Forwarding packet: tq: %i, ttl: %i\n",

		   batadv_ogm_packet->tq, batadv_ogm_packet->ttl);



	/* switch of primaries first hop flag when forwarding */

	batadv_ogm_packet->flags &= ~BATADV_PRIMARIES_FIRST_HOP;

	if (is_single_hop_neigh)

		batadv_ogm_packet->flags |= BATADV_DIRECTLINK;

	else

net/batman-adv/packet.h

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ enum batadv_subtype { 
 * enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets

 * @BATADV_NOT_BEST_NEXT_HOP: flag is set when ogm packet is forwarded and was

 *     previously received from someone else than the best neighbor.

 * @BATADV_PRIMARIES_FIRST_HOP: flag is set when the primary interface address

 *     is used, and the packet travels its first hop.

 * @BATADV_PRIMARIES_FIRST_HOP: flag unused.

 * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a

 *     one hop neighbor on the interface where it was originally received.

 */