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

Commit 95d39278 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Antonio Quartulli
Browse files

batman-adv: keep track of when unicast packets are sent 



To enable ELP to send probing packets over wireless links
only if needed, batman-adv must keep track of the last time
it sent a unicast packet towards every neighbour.

For this purpose a 2 main changes are introduced:
1) a new member of the elp_neigh_node structure stores the
   last time a unicast packet was sent towards this neighbour;
2) a wrapper function for sending unicast packets is
   implemented. This function will simply update the member
   describe din point 1) and then forward the packet to the
   real sending routine.

Point 2) implies that any code-path leading to a unicast
sending now has to use the new wrapper.

Signed-off-by: default avatarAntonio Quartulli <antonio@open-mesh.com>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
parent 0b5ecc68

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, 
		batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX);

		batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,

				   skb->len + ETH_HLEN);

		batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr);

		batadv_send_broadcast_skb(skb, hard_iface);

	}

}

net/batman-adv/bat_v_elp.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void batadv_v_elp_periodic_work(struct work_struct *work) 
		   hard_iface->net_dev->name,

		   atomic_read(&hard_iface->bat_v.elp_seqno));



	batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr);

	batadv_send_broadcast_skb(skb, hard_iface);



	atomic_inc(&hard_iface->bat_v.elp_seqno);

net/batman-adv/bat_v_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void batadv_v_ogm_send_to_if(struct sk_buff *skb, 
	batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES,

			   skb->len + ETH_HLEN);



	batadv_send_skb_packet(skb, hard_iface, batadv_broadcast_addr);

	batadv_send_broadcast_skb(skb, hard_iface);

}



/**

net/batman-adv/distributed-arp-table.c

+1 −3
Original line number Diff line number Diff line
@@ -654,9 +654,7 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, 
			goto free_neigh;

		}



		send_status = batadv_send_skb_packet(tmp_skb,

						     neigh_node->if_incoming,

						     neigh_node->addr);

		send_status = batadv_send_unicast_skb(tmp_skb, neigh_node);

		if (send_status == NET_XMIT_SUCCESS) {

			/* count the sent packet */

			switch (packet_subtype) {

net/batman-adv/fragmentation.c

+3 −5
Original line number Diff line number Diff line
@@ -378,8 +378,7 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb, 
				   skb->len + ETH_HLEN);



		packet->ttl--;

		batadv_send_skb_packet(skb, neigh_node->if_incoming,

				       neigh_node->addr);

		batadv_send_unicast_skb(skb, neigh_node);

		ret = true;

	}
@@ -486,8 +485,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb, 
		batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);

		batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES,

				   skb_fragment->len + ETH_HLEN);

		batadv_send_skb_packet(skb_fragment, neigh_node->if_incoming,

				       neigh_node->addr);

		batadv_send_unicast_skb(skb_fragment, neigh_node);

		frag_header.no++;



		/* The initial check in this function should cover this case */
@@ -506,7 +504,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb, 
	batadv_inc_counter(bat_priv, BATADV_CNT_FRAG_TX);

	batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES,

			   skb->len + ETH_HLEN);

	batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);

	batadv_send_unicast_skb(skb, neigh_node);



	ret = true;