Commit 815cc21d authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-pullrequest-20210819' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
This cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - update docs about move IRC channel away from freenode,
   by Sven Eckelmann

 - Switch to kstrtox.h for kstrtou64, by Sven Eckelmann

 - Update NULL checks, by Sven Eckelmann (2 patches)

 - remove remaining skb-copy calls for broadcast packets,
   by Linus Lüssing
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f444fea7 808cfdfa

Documentation/networking/batman-adv.rst

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ Contact 
Please send us comments, experiences, questions, anything :)



IRC:

  #batman on irc.freenode.org

  #batadv on ircs://irc.hackint.org/

Mailing-list:

  b.a.t.m.a.n@open-mesh.org (optional subscription at

  https://lists.open-mesh.org/mailman3/postorius/lists/b.a.t.m.a.n.lists.open-mesh.org/)

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3197,7 +3197,7 @@ S: Maintained 
W:	https://www.open-mesh.org/

Q:	https://patchwork.open-mesh.org/project/batman/list/

B:	https://www.open-mesh.org/projects/batman-adv/issues

C:	irc://chat.freenode.net/batman

C:	ircs://irc.hackint.org/batadv

T:	git https://git.open-mesh.org/linux-merge.git

F:	Documentation/networking/batman-adv.rst

F:	include/uapi/linux/batadv_packet.h

net/batman-adv/bat_iv_ogm.c

+25 −50
Original line number Diff line number Diff line
@@ -519,7 +519,6 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet, 
	}



out:

	if (primary_if)

	batadv_hardif_put(primary_if);

	return res;

}
@@ -857,7 +856,6 @@ static void batadv_iv_ogm_schedule_buff(struct batadv_hard_iface *hard_iface) 
	rcu_read_unlock();



out:

	if (primary_if)

	batadv_hardif_put(primary_if);

}
@@ -1046,13 +1044,9 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
unlock:

	rcu_read_unlock();

out:

	if (neigh_node)

	batadv_neigh_node_put(neigh_node);

	if (router)

	batadv_neigh_node_put(router);

	if (neigh_ifinfo)

	batadv_neigh_ifinfo_put(neigh_ifinfo);

	if (router_ifinfo)

	batadv_neigh_ifinfo_put(router_ifinfo);

}
@@ -1194,7 +1188,6 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, 
		ret = true;



out:

	if (neigh_node)

	batadv_neigh_node_put(neigh_node);

	return ret;

}
@@ -1496,15 +1489,10 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
	if (orig_neigh_node && !is_single_hop_neigh)

		batadv_orig_node_put(orig_neigh_node);

out:

	if (router_ifinfo)

	batadv_neigh_ifinfo_put(router_ifinfo);

	if (router)

	batadv_neigh_node_put(router);

	if (router_router)

	batadv_neigh_node_put(router_router);

	if (orig_neigh_router)

	batadv_neigh_node_put(orig_neigh_router);

	if (hardif_neigh)

	batadv_hardif_neigh_put(hardif_neigh);



	consume_skb(skb_priv);
@@ -1926,7 +1914,6 @@ batadv_iv_ogm_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 
	}



 out:

	if (neigh_node_best)

	batadv_neigh_node_put(neigh_node_best);



	*sub_s = 0;
@@ -2049,9 +2036,7 @@ static bool batadv_iv_ogm_neigh_diff(struct batadv_neigh_node *neigh1, 
	*diff = (int)tq1 - (int)tq2;



out:

	if (neigh1_ifinfo)

	batadv_neigh_ifinfo_put(neigh1_ifinfo);

	if (neigh2_ifinfo)

	batadv_neigh_ifinfo_put(neigh2_ifinfo);



	return ret;
@@ -2299,7 +2284,6 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) 
			if (tmp_gw_factor > max_gw_factor ||

			    (tmp_gw_factor == max_gw_factor &&

			     tq_avg > max_tq)) {

				if (curr_gw)

				batadv_gw_node_put(curr_gw);

				curr_gw = gw_node;

				kref_get(&curr_gw->refcount);
@@ -2314,7 +2298,6 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) 
			  *     $routing_class more tq points)

			  */

			if (tq_avg > max_tq) {

				if (curr_gw)

				batadv_gw_node_put(curr_gw);

				curr_gw = gw_node;

				kref_get(&curr_gw->refcount);
@@ -2332,7 +2315,6 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) 


next:

		batadv_neigh_node_put(router);

		if (router_ifinfo)

		batadv_neigh_ifinfo_put(router_ifinfo);

	}

	rcu_read_unlock();
@@ -2397,13 +2379,9 @@ static bool batadv_iv_gw_is_eligible(struct batadv_priv *bat_priv, 


	ret = true;

out:

	if (router_gw_ifinfo)

	batadv_neigh_ifinfo_put(router_gw_ifinfo);

	if (router_orig_ifinfo)

	batadv_neigh_ifinfo_put(router_orig_ifinfo);

	if (router_gw)

	batadv_neigh_node_put(router_gw);

	if (router_orig)

	batadv_neigh_node_put(router_orig);



	return ret;
@@ -2479,11 +2457,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, 
	ret = 0;



out:

	if (curr_gw)

	batadv_gw_node_put(curr_gw);

	if (router_ifinfo)

	batadv_neigh_ifinfo_put(router_ifinfo);

	if (router)

	batadv_neigh_node_put(router);

	return ret;

}

net/batman-adv/bat_v.c

+10 −20
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ static void batadv_v_iface_update_mac(struct batadv_hard_iface *hard_iface) 


	batadv_v_primary_iface_set(hard_iface);

out:

	if (primary_if)

	batadv_hardif_put(primary_if);

}
@@ -366,7 +365,6 @@ batadv_v_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, 
	}



 out:

	if (neigh_node_best)

	batadv_neigh_node_put(neigh_node_best);



	*sub_s = 0;
@@ -568,9 +566,7 @@ static int batadv_v_gw_throughput_get(struct batadv_gw_node *gw_node, u32 *bw) 


	ret = 0;

out:

	if (router)

	batadv_neigh_node_put(router);

	if (router_ifinfo)

	batadv_neigh_ifinfo_put(router_ifinfo);



	return ret;
@@ -599,7 +595,6 @@ batadv_v_gw_get_best_gw_node(struct batadv_priv *bat_priv) 
		if (curr_gw && bw <= max_bw)

			goto next;



		if (curr_gw)

		batadv_gw_node_put(curr_gw);



		curr_gw = gw_node;
@@ -662,9 +657,7 @@ static bool batadv_v_gw_is_eligible(struct batadv_priv *bat_priv, 


	ret = true;

out:

	if (curr_gw)

	batadv_gw_node_put(curr_gw);

	if (orig_gw)

	batadv_gw_node_put(orig_gw);



	return ret;
@@ -764,11 +757,8 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, 
	ret = 0;



out:

	if (curr_gw)

	batadv_gw_node_put(curr_gw);

	if (router_ifinfo)

	batadv_neigh_ifinfo_put(router_ifinfo);

	if (router)

	batadv_neigh_node_put(router);

	return ret;

}

net/batman-adv/bat_v_elp.c

+3 −6
Original line number Diff line number Diff line
@@ -486,13 +486,10 @@ static void batadv_v_elp_neigh_update(struct batadv_priv *bat_priv, 
	hardif_neigh->bat_v.elp_interval = ntohl(elp_packet->elp_interval);



hardif_free:

	if (hardif_neigh)

	batadv_hardif_neigh_put(hardif_neigh);

neigh_free:

	if (neigh)

	batadv_neigh_node_put(neigh);

orig_free:

	if (orig_neigh)

	batadv_orig_node_put(orig_neigh);

}