Commit 5952b020 authored by David S. Miller's avatar David S. Miller
Browse files

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



Simon Wunderlich says:

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

 - bump version strings, by Simon Wunderlich

 - decrease maximum fragment size, by Matthias Schiffer

 - Clean up seqfile writing, by Markus Elfring (2 patches)

 - use __func__ in debug messages, by Sven Eckelmann

 - Mark tpmeter initializers with __init, by Antonio Quartulli

 - ignore loop detection MAC addresses, by Simon Wunderlich

 - clean up some return handling, by Simon Wunderlich

 - improve ELP throughput value handling for WiFi neighbors
   in BATMAN V/ELP, by Sven Eckelmann (2 patches)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5514174f d6289088

net/batman-adv/bat_iv_ogm.c

+3 −2
Original line number Diff line number Diff line
@@ -1022,7 +1022,8 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
	u8 tq_avg;



	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "update_originator(): Searching and updating originator entry of received packet\n");

		   "%s(): Searching and updating originator entry of received packet\n",

		   __func__);



	rcu_read_lock();

	hlist_for_each_entry_rcu(tmp_neigh_node,
@@ -1944,7 +1945,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, 


			batadv_iv_ogm_orig_print_neigh(orig_node, if_outgoing,

						       seq);

			seq_puts(seq, "\n");

			seq_putc(seq, '\n');

			batman_count++;



next:

net/batman-adv/bat_v.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static void batadv_v_orig_print(struct batadv_priv *bat_priv, 
				   neigh_node->if_incoming->net_dev->name);



			batadv_v_orig_print_neigh(orig_node, if_outgoing, seq);

			seq_puts(seq, "\n");

			seq_putc(seq, '\n');

			batman_count++;



next:

net/batman-adv/bat_v_elp.c

+8 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "main.h"



#include <linux/atomic.h>

#include <linux/bitops.h>

#include <linux/byteorder/generic.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>
@@ -29,6 +30,7 @@ 
#include <linux/kernel.h>

#include <linux/kref.h>

#include <linux/netdevice.h>

#include <linux/nl80211.h>

#include <linux/random.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>
@@ -109,7 +111,11 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) 
			 */

			return 0;

		}

		if (!ret)

		if (ret)

			goto default_throughput;

		if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT)))

			goto default_throughput;



		return sinfo.expected_throughput / 100;

	}

net/batman-adv/bridge_loop_avoidance.c

+38 −35
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, 
		 */

		ether_addr_copy(ethhdr->h_source, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): CLAIM %pM on vid %d\n", mac,

			   "%s(): CLAIM %pM on vid %d\n", __func__, mac,

			   batadv_print_vid(vid));

		break;

	case BATADV_CLAIM_TYPE_UNCLAIM:
@@ -403,7 +403,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, 
		 */

		ether_addr_copy(hw_src, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac,

			   "%s(): UNCLAIM %pM on vid %d\n", __func__, mac,

			   batadv_print_vid(vid));

		break;

	case BATADV_CLAIM_TYPE_ANNOUNCE:
@@ -412,7 +412,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, 
		 */

		ether_addr_copy(hw_src, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",

			   "%s(): ANNOUNCE of %pM on vid %d\n", __func__,

			   ethhdr->h_source, batadv_print_vid(vid));

		break;

	case BATADV_CLAIM_TYPE_REQUEST:
@@ -423,15 +423,15 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac, 
		ether_addr_copy(hw_src, mac);

		ether_addr_copy(ethhdr->h_dest, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): REQUEST of %pM to %pM on vid %d\n",

			   "%s(): REQUEST of %pM to %pM on vid %d\n", __func__,

			   ethhdr->h_source, ethhdr->h_dest,

			   batadv_print_vid(vid));

		break;

	case BATADV_CLAIM_TYPE_LOOPDETECT:

		ether_addr_copy(ethhdr->h_source, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_send_claim(): LOOPDETECT of %pM to %pM on vid %d\n",

			   ethhdr->h_source, ethhdr->h_dest,

			   "%s(): LOOPDETECT of %pM to %pM on vid %d\n",

			   __func__, ethhdr->h_source, ethhdr->h_dest,

			   batadv_print_vid(vid));



		break;
@@ -509,7 +509,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig, 
		return entry;



	batadv_dbg(BATADV_DBG_BLA, bat_priv,

		   "bla_get_backbone_gw(): not found (%pM, %d), creating new entry\n",

		   "%s(): not found (%pM, %d), creating new entry\n", __func__,

		   orig, batadv_print_vid(vid));



	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
@@ -605,7 +605,8 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, 
	int i;



	batadv_dbg(BATADV_DBG_BLA, bat_priv,

		   "bla_answer_request(): received a claim request, send all of our own claims again\n");

		   "%s(): received a claim request, send all of our own claims again\n",

		   __func__);



	backbone_gw = batadv_backbone_hash_find(bat_priv,

						primary_if->net_dev->dev_addr,
@@ -718,8 +719,8 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
		kref_init(&claim->refcount);



		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_add_claim(): adding new entry %pM, vid %d to hash ...\n",

			   mac, batadv_print_vid(vid));

			   "%s(): adding new entry %pM, vid %d to hash ...\n",

			   __func__, mac, batadv_print_vid(vid));



		kref_get(&claim->refcount);

		hash_added = batadv_hash_add(bat_priv->bla.claim_hash,
@@ -739,8 +740,9 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
			goto claim_free_ref;



		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_add_claim(): changing ownership for %pM, vid %d to gw %pM\n",

			   mac, batadv_print_vid(vid), backbone_gw->orig);

			   "%s(): changing ownership for %pM, vid %d to gw %pM\n",

			   __func__, mac, batadv_print_vid(vid),

			   backbone_gw->orig);



		remove_crc = true;

	}
@@ -808,7 +810,7 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, 
	if (!claim)

		return;



	batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_del_claim(): %pM, vid %d\n",

	batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): %pM, vid %d\n", __func__,

		   mac, batadv_print_vid(vid));



	batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim,
@@ -848,8 +850,8 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, 
	crc = ntohs(*((__be16 *)(&an_addr[4])));



	batadv_dbg(BATADV_DBG_BLA, bat_priv,

		   "handle_announce(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",

		   batadv_print_vid(vid), backbone_gw->orig, crc);

		   "%s(): ANNOUNCE vid %d (sent by %pM)... CRC = %#.4x\n",

		   __func__, batadv_print_vid(vid), backbone_gw->orig, crc);



	spin_lock_bh(&backbone_gw->crc_lock);

	backbone_crc = backbone_gw->crc;
@@ -857,8 +859,8 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr, 


	if (backbone_crc != crc) {

		batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,

			   "handle_announce(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n",

			   backbone_gw->orig,

			   "%s(): CRC FAILED for %pM/%d (my = %#.4x, sent = %#.4x)\n",

			   __func__, backbone_gw->orig,

			   batadv_print_vid(backbone_gw->vid),

			   backbone_crc, crc);
@@ -903,8 +905,8 @@ static bool batadv_handle_request(struct batadv_priv *bat_priv, 
		return true;



	batadv_dbg(BATADV_DBG_BLA, bat_priv,

		   "handle_request(): REQUEST vid %d (sent by %pM)...\n",

		   batadv_print_vid(vid), ethhdr->h_source);

		   "%s(): REQUEST vid %d (sent by %pM)...\n",

		   __func__, batadv_print_vid(vid), ethhdr->h_source);



	batadv_bla_answer_request(bat_priv, primary_if, vid);

	return true;
@@ -940,7 +942,7 @@ static bool batadv_handle_unclaim(struct batadv_priv *bat_priv, 


	/* this must be an UNCLAIM frame */

	batadv_dbg(BATADV_DBG_BLA, bat_priv,

		   "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n",

		   "%s(): UNCLAIM %pM on vid %d (sent by %pM)...\n", __func__,

		   claim_addr, batadv_print_vid(vid), backbone_gw->orig);



	batadv_bla_del_claim(bat_priv, claim_addr, vid);
@@ -1160,9 +1162,9 @@ static bool batadv_bla_process_claim(struct batadv_priv *bat_priv, 
				       ethhdr);

	if (ret == 1)

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_process_claim(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",

			   ethhdr->h_source, batadv_print_vid(vid), hw_src,

			   hw_dst);

			   "%s(): received a claim frame from another group. From: %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",

			   __func__, ethhdr->h_source, batadv_print_vid(vid),

			   hw_src, hw_dst);



	if (ret < 2)

		return !!ret;
@@ -1196,8 +1198,9 @@ static bool batadv_bla_process_claim(struct batadv_priv *bat_priv, 
	}



	batadv_dbg(BATADV_DBG_BLA, bat_priv,

		   "bla_process_claim(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",

		   ethhdr->h_source, batadv_print_vid(vid), hw_src, hw_dst);

		   "%s(): ERROR - this looks like a claim frame, but is useless. eth src %pM on vid %d ...(hw_src %pM, hw_dst %pM)\n",

		   __func__, ethhdr->h_source, batadv_print_vid(vid), hw_src,

		   hw_dst);

	return true;

}
@@ -1237,8 +1240,8 @@ static void batadv_bla_purge_backbone_gw(struct batadv_priv *bat_priv, int now) 
				continue;



			batadv_dbg(BATADV_DBG_BLA, backbone_gw->bat_priv,

				   "bla_purge_backbone_gw(): backbone gw %pM timed out\n",

				   backbone_gw->orig);

				   "%s(): backbone gw %pM timed out\n",

				   __func__, backbone_gw->orig);



purge_now:

			/* don't wait for the pending request anymore */
@@ -1295,11 +1298,11 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv, 
				goto skip;



			batadv_dbg(BATADV_DBG_BLA, bat_priv,

				   "bla_purge_claims(): timed out.\n");

				   "%s(): timed out.\n", __func__);



purge_now:

			batadv_dbg(BATADV_DBG_BLA, bat_priv,

				   "bla_purge_claims(): %pM, vid %d\n",

				   "%s(): %pM, vid %d\n", __func__,

				   claim->addr, claim->vid);



			batadv_handle_unclaim(bat_priv, primary_if,
@@ -1851,8 +1854,8 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
		 */



		batadv_dbg(BATADV_DBG_BLA, bat_priv,

			   "bla_rx(): Unclaimed MAC %pM found. Claim it. Local: %s\n",

			   ethhdr->h_source,

			   "%s(): Unclaimed MAC %pM found. Claim it. Local: %s\n",

			   __func__, ethhdr->h_source,

			   batadv_is_my_client(bat_priv,

					       ethhdr->h_source, vid) ?

			   "yes" : "no");
@@ -1978,15 +1981,15 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
			 * older than 100 ms to make sure we really

			 * have a roaming client here.

			 */

			batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Roaming client %pM detected. Unclaim it.\n",

				   ethhdr->h_source);

			batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): Roaming client %pM detected. Unclaim it.\n",

				   __func__, ethhdr->h_source);

			batadv_handle_unclaim(bat_priv, primary_if,

					      primary_if->net_dev->dev_addr,

					      ethhdr->h_source, vid);

			goto allow;

		} else {

			batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Race for claim %pM detected. Drop packet.\n",

				   ethhdr->h_source);

			batadv_dbg(BATADV_DBG_BLA, bat_priv, "%s(): Race for claim %pM detected. Drop packet.\n",

				   __func__, ethhdr->h_source);

			goto handled;

		}

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst, 
						    BATADV_DAT_ADDR_MAX);



	batadv_dbg(BATADV_DBG_DAT, bat_priv,

		   "dat_select_candidates(): IP=%pI4 hash(IP)=%u\n", &ip_dst,

		   "%s(): IP=%pI4 hash(IP)=%u\n", __func__, &ip_dst,

		   ip_key);



	for (select = 0; select < BATADV_DAT_CANDIDATES_NUM; select++)

CRA Git | Maintained and supported by SUSTech CRA and CCSE