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

Commit 4bc4e64c authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-for-davem-20171006' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

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

 - bump version strings, by Simon Wunderlich

 - Cleanup patches to make checkpatch happy, by Sven Eckelmann (3 patches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d2746fe5 706cc9f5

net/batman-adv/bat_iv_ogm.c

+12 −12
Original line number Diff line number Diff line
@@ -916,8 +916,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) 
	u16 tvlv_len = 0;

	unsigned long send_time;



	if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||

	    (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))

	if (hard_iface->if_status == BATADV_IF_NOT_IN_USE ||

	    hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)

		return;



	/* the interface gets activated here to avoid race conditions between
@@ -1264,7 +1264,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, 
	 * drops as they can't send and receive at the same time.

	 */

	tq_iface_penalty = BATADV_TQ_MAX_VALUE;

	if (if_outgoing && (if_incoming == if_outgoing) &&

	if (if_outgoing && if_incoming == if_outgoing &&

	    batadv_is_wifi_hardif(if_outgoing))

		tq_iface_penalty = batadv_hop_penalty(BATADV_TQ_MAX_VALUE,

						      bat_priv);
@@ -1369,7 +1369,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, 
				ret = BATADV_NEIGH_DUP;

		} else {

			set_mark = 0;

			if (is_dup && (ret != BATADV_NEIGH_DUP))

			if (is_dup && ret != BATADV_NEIGH_DUP)

				ret = BATADV_ORIG_DUP;

		}
@@ -1515,7 +1515,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
	/* drop packet if sender is not a direct neighbor and if we

	 * don't route towards it

	 */

	if (!is_single_hop_neigh && (!orig_neigh_router)) {

	if (!is_single_hop_neigh && !orig_neigh_router) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: OGM via unknown neighbor!\n");

		goto out_neigh;
@@ -1535,7 +1535,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
	sameseq = orig_ifinfo->last_real_seqno == ntohl(ogm_packet->seqno);

	similar_ttl = (orig_ifinfo->last_ttl - 3) <= ogm_packet->ttl;



	if (is_bidirect && ((dup_status == BATADV_NO_DUP) ||

	if (is_bidirect && (dup_status == BATADV_NO_DUP ||

			    (sameseq && similar_ttl))) {

		batadv_iv_ogm_orig_update(bat_priv, orig_node,

					  orig_ifinfo, ethhdr,
@@ -1553,8 +1553,8 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
		/* OGMs from secondary interfaces should only scheduled once

		 * per interface where it has been received, not multiple times

		 */

		if ((ogm_packet->ttl <= 2) &&

		    (if_incoming != if_outgoing)) {

		if (ogm_packet->ttl <= 2 &&

		    if_incoming != if_outgoing) {

			batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

				   "Drop packet: OGM from secondary interface and wrong outgoing interface\n");

			goto out_neigh;
@@ -1590,7 +1590,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
			      if_incoming, if_outgoing);



out_neigh:

	if ((orig_neigh_node) && (!is_single_hop_neigh))

	if (orig_neigh_node && !is_single_hop_neigh)

		batadv_orig_node_put(orig_neigh_node);

out:

	if (router_ifinfo)
@@ -2523,9 +2523,9 @@ batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) 
			tmp_gw_factor *= 100 * 100;

			tmp_gw_factor >>= 18;



			if ((tmp_gw_factor > max_gw_factor) ||

			    ((tmp_gw_factor == max_gw_factor) &&

			     (tq_avg > max_tq))) {

			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;

net/batman-adv/bat_v.c

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ batadv_v_gw_get_best_gw_node(struct batadv_priv *bat_priv) 
		if (batadv_v_gw_throughput_get(gw_node, &bw) < 0)

			goto next;



		if (curr_gw && (bw <= max_bw))

		if (curr_gw && bw <= max_bw)

			goto next;



		if (curr_gw)

net/batman-adv/bat_v_elp.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) 
			hard_iface->bat_v.flags &= ~BATADV_FULL_DUPLEX;



		throughput = link_settings.base.speed;

		if (throughput && (throughput != SPEED_UNKNOWN))

		if (throughput && throughput != SPEED_UNKNOWN)

			return throughput * 10;

	}
@@ -263,8 +263,8 @@ static void batadv_v_elp_periodic_work(struct work_struct *work) 
		goto out;



	/* we are in the process of shutting this interface down */

	if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||

	    (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))

	if (hard_iface->if_status == BATADV_IF_NOT_IN_USE ||

	    hard_iface->if_status == BATADV_IF_TO_BE_REMOVED)

		goto out;



	/* the interface was enabled but may not be ready yet */

net/batman-adv/bat_v_ogm.c

+6 −6
Original line number Diff line number Diff line
@@ -304,8 +304,8 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv, 
	 * due to the store & forward characteristics of WIFI.

	 * Very low throughput values are the exception.

	 */

	if ((throughput > 10) &&

	    (if_incoming == if_outgoing) &&

	if (throughput > 10 &&

	    if_incoming == if_outgoing &&

	    !(if_incoming->bat_v.flags & BATADV_FULL_DUPLEX))

		return throughput / 2;
@@ -455,7 +455,7 @@ static int batadv_v_ogm_metric_update(struct batadv_priv *bat_priv, 
	/* drop packets with old seqnos, however accept the first packet after

	 * a host has been rebooted.

	 */

	if ((seq_diff < 0) && !protection_started)

	if (seq_diff < 0 && !protection_started)

		goto out;



	neigh_node->last_seen = jiffies;
@@ -568,8 +568,8 @@ static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv, 
		router_throughput = router_ifinfo->bat_v.throughput;

		neigh_throughput = neigh_ifinfo->bat_v.throughput;



		if ((neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF) &&

		    (router_throughput >= neigh_throughput))

		if (neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF &&

		    router_throughput >= neigh_throughput)

			goto out;

	}
@@ -621,7 +621,7 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, 
		return;



	/* only unknown & newer OGMs contain TVLVs we are interested in */

	if ((seqno_age > 0) && (if_outgoing == BATADV_IF_DEFAULT))

	if (seqno_age > 0 && if_outgoing == BATADV_IF_DEFAULT)

		batadv_tvlv_containers_process(bat_priv, true, orig_node,

					       NULL, NULL,

					       (unsigned char *)(ogm2 + 1),

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

+2 −2
Original line number Diff line number Diff line
@@ -492,8 +492,8 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res, 
	/* this is an hash collision with the temporary selected node. Choose

	 * the one with the lowest address

	 */

	if ((tmp_max == max) && max_orig_node &&

	    (batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0))

	if (tmp_max == max && max_orig_node &&

	    batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0)

		goto out;



	ret = true;