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

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

batman-adv: Prefix packet structs with batadv_ 



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

net/batman-adv/bat_iv_ogm.c

+129 −129
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static struct neigh_node *batadv_iv_ogm_neigh_new(struct hard_iface *hard_iface, 


static int batadv_iv_ogm_iface_enable(struct hard_iface *hard_iface)

{

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;

	uint32_t random_seqno;

	int res = -ENOMEM;
@@ -70,14 +70,14 @@ static int batadv_iv_ogm_iface_enable(struct hard_iface *hard_iface) 
	if (!hard_iface->packet_buff)

		goto out;



	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;

	batman_ogm_packet->header.packet_type = BATADV_IV_OGM;

	batman_ogm_packet->header.version = BATADV_COMPAT_VERSION;

	batman_ogm_packet->header.ttl = 2;

	batman_ogm_packet->flags = BATADV_NO_FLAGS;

	batman_ogm_packet->tq = BATADV_TQ_MAX_VALUE;

	batman_ogm_packet->tt_num_changes = 0;

	batman_ogm_packet->ttvn = 0;

	batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;

	batadv_ogm_packet->header.packet_type = BATADV_IV_OGM;

	batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION;

	batadv_ogm_packet->header.ttl = 2;

	batadv_ogm_packet->flags = BATADV_NO_FLAGS;

	batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE;

	batadv_ogm_packet->tt_num_changes = 0;

	batadv_ogm_packet->ttvn = 0;



	res = 0;
@@ -93,22 +93,22 @@ static void batadv_iv_ogm_iface_disable(struct hard_iface *hard_iface) 


static void batadv_iv_ogm_iface_update_mac(struct hard_iface *hard_iface)

{

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;



	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;

	memcpy(batman_ogm_packet->orig,

	batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;

	memcpy(batadv_ogm_packet->orig,

	       hard_iface->net_dev->dev_addr, ETH_ALEN);

	memcpy(batman_ogm_packet->prev_sender,

	memcpy(batadv_ogm_packet->prev_sender,

	       hard_iface->net_dev->dev_addr, ETH_ALEN);

}



static void batadv_iv_ogm_primary_iface_set(struct hard_iface *hard_iface)

{

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;



	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;

	batman_ogm_packet->flags = BATADV_PRIMARIES_FIRST_HOP;

	batman_ogm_packet->header.ttl = BATADV_TTL;

	batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;

	batadv_ogm_packet->flags = BATADV_PRIMARIES_FIRST_HOP;

	batadv_ogm_packet->header.ttl = BATADV_TTL;

}



/* when do we schedule our own ogm to be sent */
@@ -162,7 +162,7 @@ static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet, 
	char *fwd_str;

	uint8_t packet_num;

	int16_t buff_pos;

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;

	struct sk_buff *skb;



	if (hard_iface->if_status != BATADV_IF_ACTIVE)
@@ -170,20 +170,20 @@ static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet, 


	packet_num = 0;

	buff_pos = 0;

	batman_ogm_packet = (struct batman_ogm_packet *)forw_packet->skb->data;

	batadv_ogm_packet = (struct batadv_ogm_packet *)forw_packet->skb->data;



	/* adjust all flags and log packets */

	while (batadv_iv_ogm_aggr_packet(buff_pos, forw_packet->packet_len,

					 batman_ogm_packet->tt_num_changes)) {

					 batadv_ogm_packet->tt_num_changes)) {



		/* we might have aggregated direct link packets with an

		 * ordinary base packet

		 */

		if ((forw_packet->direct_link_flags & (1 << packet_num)) &&

		    (forw_packet->if_incoming == hard_iface))

			batman_ogm_packet->flags |= BATADV_DIRECTLINK;

			batadv_ogm_packet->flags |= BATADV_DIRECTLINK;

		else

			batman_ogm_packet->flags &= ~BATADV_DIRECTLINK;

			batadv_ogm_packet->flags &= ~BATADV_DIRECTLINK;



		fwd_str = (packet_num > 0 ? "Forwarding" : (forw_packet->own ?

							    "Sending own" :
@@ -191,18 +191,18 @@ static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet, 
		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "%s %spacket (originator %pM, seqno %u, TQ %d, TTL %d, IDF %s, ttvn %d) on interface %s [%pM]\n",

			   fwd_str, (packet_num > 0 ? "aggregated " : ""),

			   batman_ogm_packet->orig,

			   ntohl(batman_ogm_packet->seqno),

			   batman_ogm_packet->tq, batman_ogm_packet->header.ttl,

			   (batman_ogm_packet->flags & BATADV_DIRECTLINK ?

			   batadv_ogm_packet->orig,

			   ntohl(batadv_ogm_packet->seqno),

			   batadv_ogm_packet->tq, batadv_ogm_packet->header.ttl,

			   (batadv_ogm_packet->flags & BATADV_DIRECTLINK ?

			    "on" : "off"),

			   batman_ogm_packet->ttvn, hard_iface->net_dev->name,

			   batadv_ogm_packet->ttvn, hard_iface->net_dev->name,

			   hard_iface->net_dev->dev_addr);



		buff_pos += BATADV_OGM_HLEN;

		buff_pos += batadv_tt_len(batman_ogm_packet->tt_num_changes);

		buff_pos += batadv_tt_len(batadv_ogm_packet->tt_num_changes);

		packet_num++;

		batman_ogm_packet = (struct batman_ogm_packet *)

		batadv_ogm_packet = (struct batadv_ogm_packet *)

					(forw_packet->skb->data + buff_pos);

	}
@@ -223,12 +223,12 @@ static void batadv_iv_ogm_emit(struct forw_packet *forw_packet) 
	struct net_device *soft_iface;

	struct bat_priv *bat_priv;

	struct hard_iface *primary_if = NULL;

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;

	unsigned char directlink;



	batman_ogm_packet = (struct batman_ogm_packet *)

	batadv_ogm_packet = (struct batadv_ogm_packet *)

						(forw_packet->skb->data);

	directlink = (batman_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0);

	directlink = (batadv_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0);



	if (!forw_packet->if_incoming) {

		pr_err("Error - can't forward packet: incoming iface not specified\n");
@@ -248,16 +248,16 @@ static void batadv_iv_ogm_emit(struct forw_packet *forw_packet) 
	/* multihomed peer assumed

	 * non-primary OGMs are only broadcasted on their interface

	 */

	if ((directlink && (batman_ogm_packet->header.ttl == 1)) ||

	if ((directlink && (batadv_ogm_packet->header.ttl == 1)) ||

	    (forw_packet->own && (forw_packet->if_incoming != primary_if))) {



		/* FIXME: what about aggregated packets ? */

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "%s packet (originator %pM, seqno %u, TTL %d) on interface %s [%pM]\n",

			   (forw_packet->own ? "Sending own" : "Forwarding"),

			   batman_ogm_packet->orig,

			   ntohl(batman_ogm_packet->seqno),

			   batman_ogm_packet->header.ttl,

			   batadv_ogm_packet->orig,

			   ntohl(batadv_ogm_packet->seqno),

			   batadv_ogm_packet->header.ttl,

			   forw_packet->if_incoming->net_dev->name,

			   forw_packet->if_incoming->net_dev->dev_addr);
@@ -287,20 +287,20 @@ static void batadv_iv_ogm_emit(struct forw_packet *forw_packet) 


/* return true if new_packet can be aggregated with forw_packet */

static bool

batadv_iv_ogm_can_aggregate(const struct batman_ogm_packet *new_bat_ogm_packet,

batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,

			    struct bat_priv *bat_priv,

			    int packet_len, unsigned long send_time,

			    bool directlink,

			    const struct hard_iface *if_incoming,

			    const struct forw_packet *forw_packet)

{

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;

	int aggregated_bytes = forw_packet->packet_len + packet_len;

	struct hard_iface *primary_if = NULL;

	bool res = false;

	unsigned long aggregation_end_time;



	batman_ogm_packet = (struct batman_ogm_packet *)forw_packet->skb->data;

	batadv_ogm_packet = (struct batadv_ogm_packet *)forw_packet->skb->data;

	aggregation_end_time = send_time;

	aggregation_end_time += msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS);
@@ -330,8 +330,8 @@ batadv_iv_ogm_can_aggregate(const struct batman_ogm_packet *new_bat_ogm_packet, 
		 * are flooded through the net

		 */

		if ((!directlink) &&

		    (!(batman_ogm_packet->flags & BATADV_DIRECTLINK)) &&

		    (batman_ogm_packet->header.ttl != 1) &&

		    (!(batadv_ogm_packet->flags & BATADV_DIRECTLINK)) &&

		    (batadv_ogm_packet->header.ttl != 1) &&



		    /* own packets originating non-primary

		     * interfaces leave only that interface
@@ -353,7 +353,7 @@ batadv_iv_ogm_can_aggregate(const struct batman_ogm_packet *new_bat_ogm_packet, 
		     * own secondary interface packets

		     * (= secondary interface packets in general)

		     */

		    (batman_ogm_packet->flags & BATADV_DIRECTLINK ||

		    (batadv_ogm_packet->flags & BATADV_DIRECTLINK ||

		     (forw_packet->own &&

		      forw_packet->if_incoming != primary_if))) {

			res = true;
@@ -475,12 +475,12 @@ static void batadv_iv_ogm_queue_add(struct bat_priv *bat_priv, 
	 */

	struct forw_packet *forw_packet_aggr = NULL, *forw_packet_pos = NULL;

	struct hlist_node *tmp_node;

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;

	bool direct_link;

	unsigned long max_aggregation_jiffies;



	batman_ogm_packet = (struct batman_ogm_packet *)packet_buff;

	direct_link = batman_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0;

	batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;

	direct_link = batadv_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0;

	max_aggregation_jiffies = msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS);



	/* find position for the packet in the forward queue */
@@ -489,7 +489,7 @@ static void batadv_iv_ogm_queue_add(struct bat_priv *bat_priv, 
	if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) {

		hlist_for_each_entry(forw_packet_pos, tmp_node,

				     &bat_priv->forw_bat_list, list) {

			if (batadv_iv_ogm_can_aggregate(batman_ogm_packet,

			if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet,

							bat_priv, packet_len,

							send_time, direct_link,

							if_incoming,
@@ -526,7 +526,7 @@ static void batadv_iv_ogm_queue_add(struct bat_priv *bat_priv, 


static void batadv_iv_ogm_forward(struct orig_node *orig_node,

				  const struct ethhdr *ethhdr,

				  struct batman_ogm_packet *batman_ogm_packet,

				  struct batadv_ogm_packet *batadv_ogm_packet,

				  bool is_single_hop_neigh,

				  bool is_from_best_next_hop,

				  struct hard_iface *if_incoming)
@@ -534,7 +534,7 @@ static void batadv_iv_ogm_forward(struct orig_node *orig_node, 
	struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	uint8_t tt_num_changes;



	if (batman_ogm_packet->header.ttl <= 1) {

	if (batadv_ogm_packet->header.ttl <= 1) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "ttl exceeded\n");

		return;

	}
@@ -547,32 +547,32 @@ static void batadv_iv_ogm_forward(struct orig_node *orig_node, 
		 * simply drop the ogm.

		 */

		if (is_single_hop_neigh)

			batman_ogm_packet->flags |= BATADV_NOT_BEST_NEXT_HOP;

			batadv_ogm_packet->flags |= BATADV_NOT_BEST_NEXT_HOP;

		else

			return;

	}



	tt_num_changes = batman_ogm_packet->tt_num_changes;

	tt_num_changes = batadv_ogm_packet->tt_num_changes;



	batman_ogm_packet->header.ttl--;

	memcpy(batman_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN);

	batadv_ogm_packet->header.ttl--;

	memcpy(batadv_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN);



	/* apply hop penalty */

	batman_ogm_packet->tq = batadv_hop_penalty(batman_ogm_packet->tq,

	batadv_ogm_packet->tq = batadv_hop_penalty(batadv_ogm_packet->tq,

						   bat_priv);



	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "Forwarding packet: tq: %i, ttl: %i\n",

		   batman_ogm_packet->tq, batman_ogm_packet->header.ttl);

		   batadv_ogm_packet->tq, batadv_ogm_packet->header.ttl);



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

	batman_ogm_packet->flags &= ~BATADV_PRIMARIES_FIRST_HOP;

	batadv_ogm_packet->flags &= ~BATADV_PRIMARIES_FIRST_HOP;

	if (is_single_hop_neigh)

		batman_ogm_packet->flags |= BATADV_DIRECTLINK;

		batadv_ogm_packet->flags |= BATADV_DIRECTLINK;

	else

		batman_ogm_packet->flags &= ~BATADV_DIRECTLINK;

		batadv_ogm_packet->flags &= ~BATADV_DIRECTLINK;



	batadv_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet,

	batadv_iv_ogm_queue_add(bat_priv, (unsigned char *)batadv_ogm_packet,

				BATADV_OGM_HLEN + batadv_tt_len(tt_num_changes),

				if_incoming, 0, batadv_iv_ogm_fwd_send_time());

}
@@ -580,7 +580,7 @@ static void batadv_iv_ogm_forward(struct orig_node *orig_node, 
static void batadv_iv_ogm_schedule(struct hard_iface *hard_iface)

{

	struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface);

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;

	struct hard_iface *primary_if;

	int vis_server, tt_num_changes = 0;
@@ -593,29 +593,29 @@ static void batadv_iv_ogm_schedule(struct hard_iface *hard_iface) 
						       &hard_iface->packet_len,

						       BATADV_OGM_HLEN);



	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;

	batadv_ogm_packet = (struct batadv_ogm_packet *)hard_iface->packet_buff;



	/* change sequence number to network order */

	batman_ogm_packet->seqno =

	batadv_ogm_packet->seqno =

			htonl((uint32_t)atomic_read(&hard_iface->seqno));

	atomic_inc(&hard_iface->seqno);



	batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);

	batman_ogm_packet->tt_crc = htons(bat_priv->tt_crc);

	batadv_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);

	batadv_ogm_packet->tt_crc = htons(bat_priv->tt_crc);

	if (tt_num_changes >= 0)

		batman_ogm_packet->tt_num_changes = tt_num_changes;

		batadv_ogm_packet->tt_num_changes = tt_num_changes;



	if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC)

		batman_ogm_packet->flags |= BATADV_VIS_SERVER;

		batadv_ogm_packet->flags |= BATADV_VIS_SERVER;

	else

		batman_ogm_packet->flags &= ~BATADV_VIS_SERVER;

		batadv_ogm_packet->flags &= ~BATADV_VIS_SERVER;



	if ((hard_iface == primary_if) &&

	    (atomic_read(&bat_priv->gw_mode) == BATADV_GW_MODE_SERVER))

		batman_ogm_packet->gw_flags =

		batadv_ogm_packet->gw_flags =

				(uint8_t)atomic_read(&bat_priv->gw_bandwidth);

	else

		batman_ogm_packet->gw_flags = BATADV_NO_FLAGS;

		batadv_ogm_packet->gw_flags = BATADV_NO_FLAGS;



	batadv_slide_own_bcast_window(hard_iface);

	batadv_iv_ogm_queue_add(bat_priv, hard_iface->packet_buff,
@@ -630,7 +630,7 @@ static void 
batadv_iv_ogm_orig_update(struct bat_priv *bat_priv,

			  struct orig_node *orig_node,

			  const struct ethhdr *ethhdr,

			  const struct batman_ogm_packet *batman_ogm_packet,

			  const struct batadv_ogm_packet *batadv_ogm_packet,

			  struct hard_iface *if_incoming,

			  const unsigned char *tt_buff,

			  int is_duplicate)
@@ -679,7 +679,7 @@ batadv_iv_ogm_orig_update(struct bat_priv *bat_priv, 
		neigh_node = batadv_iv_ogm_neigh_new(if_incoming,

						     ethhdr->h_source,

						     orig_node, orig_tmp,

						     batman_ogm_packet->seqno);

						     batadv_ogm_packet->seqno);



		batadv_orig_node_free_ref(orig_tmp);

		if (!neigh_node)
@@ -690,19 +690,19 @@ batadv_iv_ogm_orig_update(struct bat_priv *bat_priv, 


	rcu_read_unlock();



	orig_node->flags = batman_ogm_packet->flags;

	orig_node->flags = batadv_ogm_packet->flags;

	neigh_node->last_seen = jiffies;



	spin_lock_bh(&neigh_node->lq_update_lock);

	batadv_ring_buffer_set(neigh_node->tq_recv,

			       &neigh_node->tq_index,

			       batman_ogm_packet->tq);

			       batadv_ogm_packet->tq);

	neigh_node->tq_avg = batadv_ring_buffer_avg(neigh_node->tq_recv);

	spin_unlock_bh(&neigh_node->lq_update_lock);



	if (!is_duplicate) {

		orig_node->last_ttl = batman_ogm_packet->header.ttl;

		neigh_node->last_ttl = batman_ogm_packet->header.ttl;

		orig_node->last_ttl = batadv_ogm_packet->header.ttl;

		neigh_node->last_ttl = batadv_ogm_packet->header.ttl;

	}



	batadv_bonding_candidate_add(orig_node, neigh_node);
@@ -744,19 +744,19 @@ batadv_iv_ogm_orig_update(struct bat_priv *bat_priv, 
	/* I have to check for transtable changes only if the OGM has been

	 * sent through a primary interface

	 */

	if (((batman_ogm_packet->orig != ethhdr->h_source) &&

	     (batman_ogm_packet->header.ttl > 2)) ||

	    (batman_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP))

	if (((batadv_ogm_packet->orig != ethhdr->h_source) &&

	     (batadv_ogm_packet->header.ttl > 2)) ||

	    (batadv_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP))

		batadv_tt_update_orig(bat_priv, orig_node, tt_buff,

				      batman_ogm_packet->tt_num_changes,

				      batman_ogm_packet->ttvn,

				      ntohs(batman_ogm_packet->tt_crc));

				      batadv_ogm_packet->tt_num_changes,

				      batadv_ogm_packet->ttvn,

				      ntohs(batadv_ogm_packet->tt_crc));



	if (orig_node->gw_flags != batman_ogm_packet->gw_flags)

	if (orig_node->gw_flags != batadv_ogm_packet->gw_flags)

		batadv_gw_node_update(bat_priv, orig_node,

				      batman_ogm_packet->gw_flags);

				      batadv_ogm_packet->gw_flags);



	orig_node->gw_flags = batman_ogm_packet->gw_flags;

	orig_node->gw_flags = batadv_ogm_packet->gw_flags;



	/* restart gateway selection if fast or late switching was enabled */

	if ((orig_node->gw_flags) &&
@@ -777,7 +777,7 @@ batadv_iv_ogm_orig_update(struct bat_priv *bat_priv, 


static int batadv_iv_ogm_calc_tq(struct orig_node *orig_node,

				 struct orig_node *orig_neigh_node,

				 struct batman_ogm_packet *batman_ogm_packet,

				 struct batadv_ogm_packet *batadv_ogm_packet,

				 struct hard_iface *if_incoming)

{

	struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
@@ -814,7 +814,7 @@ static int batadv_iv_ogm_calc_tq(struct orig_node *orig_node, 
						     orig_neigh_node->orig,

						     orig_neigh_node,

						     orig_neigh_node,

						     batman_ogm_packet->seqno);

						     batadv_ogm_packet->seqno);



	if (!neigh_node)

		goto out;
@@ -862,20 +862,20 @@ static int batadv_iv_ogm_calc_tq(struct orig_node *orig_node, 
	inv_asym_penalty /= neigh_rq_max_cube;

	tq_asym_penalty = BATADV_TQ_MAX_VALUE - inv_asym_penalty;



	combined_tq = batman_ogm_packet->tq * tq_own * tq_asym_penalty;

	combined_tq = batadv_ogm_packet->tq * tq_own * tq_asym_penalty;

	combined_tq /= BATADV_TQ_MAX_VALUE * BATADV_TQ_MAX_VALUE;

	batman_ogm_packet->tq = combined_tq;

	batadv_ogm_packet->tq = combined_tq;



	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "bidirectional: orig = %-15pM neigh = %-15pM => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i\n",

		   orig_node->orig, orig_neigh_node->orig, total_count,

		   neigh_rq_count, tq_own,

		   tq_asym_penalty, batman_ogm_packet->tq);

		   tq_asym_penalty, batadv_ogm_packet->tq);



	/* if link has the minimum required transmission quality

	 * consider it bidirectional

	 */

	if (batman_ogm_packet->tq >= BATADV_TQ_TOTAL_BIDRECT_LIMIT)

	if (batadv_ogm_packet->tq >= BATADV_TQ_TOTAL_BIDRECT_LIMIT)

		ret = 1;



out:
@@ -894,7 +894,7 @@ static int batadv_iv_ogm_calc_tq(struct orig_node *orig_node, 
 */

static int

batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,

			    const struct batman_ogm_packet *batman_ogm_packet,

			    const struct batadv_ogm_packet *batadv_ogm_packet,

			    const struct hard_iface *if_incoming)

{

	struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);
@@ -905,10 +905,10 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, 
	int32_t seq_diff;

	int need_update = 0;

	int set_mark, ret = -1;

	uint32_t seqno = ntohl(batman_ogm_packet->seqno);

	uint32_t seqno = ntohl(batadv_ogm_packet->seqno);

	uint8_t *neigh_addr;



	orig_node = batadv_get_orig_node(bat_priv, batman_ogm_packet->orig);

	orig_node = batadv_get_orig_node(bat_priv, batadv_ogm_packet->orig);

	if (!orig_node)

		return 0;
@@ -963,7 +963,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, 
}



static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,

				  struct batman_ogm_packet *batman_ogm_packet,

				  struct batadv_ogm_packet *batadv_ogm_packet,

				  const unsigned char *tt_buff,

				  struct hard_iface *if_incoming)

{
@@ -989,34 +989,34 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
	 * it as an additional length.

	 *

	 * TODO: A more sane solution would be to have a bit in the

	 * batman_ogm_packet to detect whether the packet is the last

	 * batadv_ogm_packet to detect whether the packet is the last

	 * packet in an aggregation.  Here we expect that the padding

	 * is always zero (or not 0x01)

	 */

	if (batman_ogm_packet->header.packet_type != BATADV_IV_OGM)

	if (batadv_ogm_packet->header.packet_type != BATADV_IV_OGM)

		return;



	/* could be changed by schedule_own_packet() */

	if_incoming_seqno = atomic_read(&if_incoming->seqno);



	if (batman_ogm_packet->flags & BATADV_DIRECTLINK)

	if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)

		has_directlink_flag = 1;

	else

		has_directlink_flag = 0;



	if (batadv_compare_eth(ethhdr->h_source, batman_ogm_packet->orig))

	if (batadv_compare_eth(ethhdr->h_source, batadv_ogm_packet->orig))

		is_single_hop_neigh = true;



	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n",

		   ethhdr->h_source, if_incoming->net_dev->name,

		   if_incoming->net_dev->dev_addr, batman_ogm_packet->orig,

		   batman_ogm_packet->prev_sender,

		   ntohl(batman_ogm_packet->seqno), batman_ogm_packet->ttvn,

		   ntohs(batman_ogm_packet->tt_crc),

		   batman_ogm_packet->tt_num_changes, batman_ogm_packet->tq,

		   batman_ogm_packet->header.ttl,

		   batman_ogm_packet->header.version, has_directlink_flag);

		   if_incoming->net_dev->dev_addr, batadv_ogm_packet->orig,

		   batadv_ogm_packet->prev_sender,

		   ntohl(batadv_ogm_packet->seqno), batadv_ogm_packet->ttvn,

		   ntohs(batadv_ogm_packet->tt_crc),

		   batadv_ogm_packet->tt_num_changes, batadv_ogm_packet->tq,

		   batadv_ogm_packet->header.ttl,

		   batadv_ogm_packet->header.version, has_directlink_flag);



	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
@@ -1030,11 +1030,11 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
				       hard_iface->net_dev->dev_addr))

			is_my_addr = 1;



		if (batadv_compare_eth(batman_ogm_packet->orig,

		if (batadv_compare_eth(batadv_ogm_packet->orig,

				       hard_iface->net_dev->dev_addr))

			is_my_orig = 1;



		if (batadv_compare_eth(batman_ogm_packet->prev_sender,

		if (batadv_compare_eth(batadv_ogm_packet->prev_sender,

				       hard_iface->net_dev->dev_addr))

			is_my_oldorig = 1;
@@ -1043,10 +1043,10 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
	}

	rcu_read_unlock();



	if (batman_ogm_packet->header.version != BATADV_COMPAT_VERSION) {

	if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: incompatible batman version (%i)\n",

			   batman_ogm_packet->header.version);

			   batadv_ogm_packet->header.version);

		return;

	}
@@ -1082,14 +1082,14 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
		 */

		if (has_directlink_flag &&

		    batadv_compare_eth(if_incoming->net_dev->dev_addr,

				       batman_ogm_packet->orig)) {

				       batadv_ogm_packet->orig)) {

			if_num = if_incoming->if_num;

			offset = if_num * BATADV_NUM_WORDS;



			spin_lock_bh(&orig_neigh_node->ogm_cnt_lock);

			word = &(orig_neigh_node->bcast_own[offset]);

			bit_pos = if_incoming_seqno - 2;

			bit_pos -= ntohl(batman_ogm_packet->seqno);

			bit_pos -= ntohl(batadv_ogm_packet->seqno);

			batadv_set_bit(word, bit_pos);

			weight = &orig_neigh_node->bcast_own_sum[if_num];

			*weight = bitmap_weight(word,
@@ -1110,18 +1110,18 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
		return;

	}



	if (batman_ogm_packet->flags & BATADV_NOT_BEST_NEXT_HOP) {

	if (batadv_ogm_packet->flags & BATADV_NOT_BEST_NEXT_HOP) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: ignoring all packets not forwarded from the best next hop (sender: %pM)\n",

			   ethhdr->h_source);

		return;

	}



	orig_node = batadv_get_orig_node(bat_priv, batman_ogm_packet->orig);

	orig_node = batadv_get_orig_node(bat_priv, batadv_ogm_packet->orig);

	if (!orig_node)

		return;



	is_duplicate = batadv_iv_ogm_update_seqnos(ethhdr, batman_ogm_packet,

	is_duplicate = batadv_iv_ogm_update_seqnos(ethhdr, batadv_ogm_packet,

						   if_incoming);



	if (is_duplicate == -1) {
@@ -1131,7 +1131,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
		goto out;

	}



	if (batman_ogm_packet->tq == 0) {

	if (batadv_ogm_packet->tq == 0) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: originator packet with tq equal 0\n");

		goto out;
@@ -1145,11 +1145,11 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
	    (batadv_compare_eth(router->addr, ethhdr->h_source)))

		is_from_best_next_hop = true;



	prev_sender = batman_ogm_packet->prev_sender;

	prev_sender = batadv_ogm_packet->prev_sender;

	/* avoid temporary routing loops */

	if (router && router_router &&

	    (batadv_compare_eth(router->addr, prev_sender)) &&

	    !(batadv_compare_eth(batman_ogm_packet->orig, prev_sender)) &&

	    !(batadv_compare_eth(batadv_ogm_packet->orig, prev_sender)) &&

	    (batadv_compare_eth(router->addr, router_router->addr))) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %pM)\n",
@@ -1178,26 +1178,26 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
	}



	is_bidirect = batadv_iv_ogm_calc_tq(orig_node, orig_neigh_node,

					    batman_ogm_packet, if_incoming);

					    batadv_ogm_packet, if_incoming);



	batadv_bonding_save_primary(orig_node, orig_neigh_node,

				    batman_ogm_packet);

				    batadv_ogm_packet);



	/* update ranking if it is not a duplicate or has the same

	 * seqno and similar ttl as the non-duplicate

	 */

	sameseq = orig_node->last_real_seqno == ntohl(batman_ogm_packet->seqno);

	simlar_ttl = orig_node->last_ttl - 3 <= batman_ogm_packet->header.ttl;

	sameseq = orig_node->last_real_seqno == ntohl(batadv_ogm_packet->seqno);

	simlar_ttl = orig_node->last_ttl - 3 <= batadv_ogm_packet->header.ttl;

	if (is_bidirect && (!is_duplicate || (sameseq && simlar_ttl)))

		batadv_iv_ogm_orig_update(bat_priv, orig_node, ethhdr,

					  batman_ogm_packet, if_incoming,

					  batadv_ogm_packet, if_incoming,

					  tt_buff, is_duplicate);



	/* is single hop (direct) neighbor */

	if (is_single_hop_neigh) {



		/* mark direct link on incoming interface */

		batadv_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,

		batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet,

				      is_single_hop_neigh,

				      is_from_best_next_hop, if_incoming);
@@ -1221,7 +1221,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 


	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "Forwarding packet: rebroadcast originator packet\n");

	batadv_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet,

	batadv_iv_ogm_forward(orig_node, ethhdr, batadv_ogm_packet,

			      is_single_hop_neigh, is_from_best_next_hop,

			      if_incoming);
@@ -1243,7 +1243,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 
				 struct hard_iface *if_incoming)

{

	struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	struct batman_ogm_packet *batman_ogm_packet;

	struct batadv_ogm_packet *batadv_ogm_packet;

	struct ethhdr *ethhdr;

	int buff_pos = 0, packet_len;

	unsigned char *tt_buff, *packet_buff;
@@ -1266,22 +1266,22 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 
	packet_len = skb_headlen(skb);

	ethhdr = (struct ethhdr *)skb_mac_header(skb);

	packet_buff = skb->data;

	batman_ogm_packet = (struct batman_ogm_packet *)packet_buff;

	batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;



	/* unpack the aggregated packets and process them one by one */

	do {

		tt_buff = packet_buff + buff_pos + BATADV_OGM_HLEN;



		batadv_iv_ogm_process(ethhdr, batman_ogm_packet, tt_buff,

		batadv_iv_ogm_process(ethhdr, batadv_ogm_packet, tt_buff,

				      if_incoming);



		buff_pos += BATADV_OGM_HLEN;

		buff_pos += batadv_tt_len(batman_ogm_packet->tt_num_changes);

		buff_pos += batadv_tt_len(batadv_ogm_packet->tt_num_changes);



		batman_ogm_packet = (struct batman_ogm_packet *)

		batadv_ogm_packet = (struct batadv_ogm_packet *)

						(packet_buff + buff_pos);

	} while (batadv_iv_ogm_aggr_packet(buff_pos, packet_len,

					   batman_ogm_packet->tt_num_changes));

					   batadv_ogm_packet->tt_num_changes));



	kfree_skb(skb);

	return NET_RX_SUCCESS;

net/batman-adv/bridge_loop_avoidance.c

+6 −6

File changed.

Preview size limit exceeded, changes collapsed.

net/batman-adv/bridge_loop_avoidance.h

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

net/batman-adv/hard-interface.c

+2 −2
Original line number Diff line number Diff line
@@ -100,14 +100,14 @@ batadv_hardif_get_active(const struct net_device *soft_iface) 
static void batadv_primary_if_update_addr(struct bat_priv *bat_priv,

					  struct hard_iface *oldif)

{

	struct vis_packet *vis_packet;

	struct batadv_vis_packet *vis_packet;

	struct hard_iface *primary_if;



	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (!primary_if)

		goto out;



	vis_packet = (struct vis_packet *)

	vis_packet = (struct batadv_vis_packet *)

				bat_priv->my_vis_info->skb_packet->data;

	memcpy(vis_packet->vis_orig, primary_if->net_dev->dev_addr, ETH_ALEN);

	memcpy(vis_packet->sender_orig,

net/batman-adv/icmp_socket.c

+11 −11

File changed.

Preview size limit exceeded, changes collapsed.