Commit 6ff4e36f authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge 



Antonio Quartulli says:

====================
pull request: batman-adv 2014-08-05

this is a pull request intended for net-next/linux-3.17 (yeah..it's really
late).

Patches 1, 2 and 4 are really minor changes:
- kmalloc_array is substituted to kmalloc when possible (as suggested by
  checkpatch);
- net_ratelimited() is now used properly and the "suppressed" message is not
  printed anymore if not needed;
- the internal version number has been increased to reflect our current version.

Patch 3 instead is introducing a change in the metric computation function
by changing the penalty applied at each mesh hop from 15/255 (~6%) to
30/255 (~11%). This change is introduced by Simon Wunderlich after having
observed a performance improvement in several networks when using the new value.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ff204cce 71b75d0e

net/batman-adv/bat_iv_ogm.c

+7 −6
Original line number Diff line number Diff line
@@ -108,14 +108,15 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, 
				     int max_if_num)

{

	void *data_ptr;

	size_t data_size, old_size;

	size_t old_size;

	int ret = -ENOMEM;



	spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock);



	data_size = max_if_num * sizeof(unsigned long) * BATADV_NUM_WORDS;

	old_size = (max_if_num - 1) * sizeof(unsigned long) * BATADV_NUM_WORDS;

	data_ptr = kmalloc(data_size, GFP_ATOMIC);

	data_ptr = kmalloc_array(max_if_num,

				 BATADV_NUM_WORDS * sizeof(unsigned long),

				 GFP_ATOMIC);

	if (!data_ptr)

		goto unlock;
@@ -123,7 +124,7 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, 
	kfree(orig_node->bat_iv.bcast_own);

	orig_node->bat_iv.bcast_own = data_ptr;



	data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);

	data_ptr = kmalloc_array(max_if_num, sizeof(uint8_t), GFP_ATOMIC);

	if (!data_ptr) {

		kfree(orig_node->bat_iv.bcast_own);

		goto unlock;
@@ -164,7 +165,7 @@ static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, 
		goto free_bcast_own;



	chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS;

	data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC);

	data_ptr = kmalloc_array(max_if_num, chunk_size, GFP_ATOMIC);

	if (!data_ptr)

		goto unlock;
@@ -183,7 +184,7 @@ free_bcast_own: 
	if (max_if_num == 0)

		goto free_own_sum;



	data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);

	data_ptr = kmalloc_array(max_if_num, sizeof(uint8_t), GFP_ATOMIC);

	if (!data_ptr) {

		kfree(orig_node->bat_iv.bcast_own);

		goto unlock;

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

+2 −1
Original line number Diff line number Diff line
@@ -537,7 +537,8 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) 
	if (!bat_priv->orig_hash)

		return NULL;



	res = kmalloc(BATADV_DAT_CANDIDATES_NUM * sizeof(*res), GFP_ATOMIC);

	res = kmalloc_array(BATADV_DAT_CANDIDATES_NUM, sizeof(*res),

			    GFP_ATOMIC);

	if (!res)

		return NULL;

net/batman-adv/hash.c

+3 −3
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ struct batadv_hashtable *batadv_hash_new(uint32_t size) 
	if (!hash)

		return NULL;



	hash->table = kmalloc(sizeof(*hash->table) * size, GFP_ATOMIC);

	hash->table = kmalloc_array(size, sizeof(*hash->table), GFP_ATOMIC);

	if (!hash->table)

		goto free_hash;



	hash->list_locks = kmalloc(sizeof(*hash->list_locks) * size,

	hash->list_locks = kmalloc_array(size, sizeof(*hash->list_locks),

					 GFP_ATOMIC);

	if (!hash->list_locks)

		goto free_table;

net/batman-adv/main.h

+15 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define BATADV_DRIVER_DEVICE "batman-adv"



#ifndef BATADV_SOURCE_VERSION

#define BATADV_SOURCE_VERSION "2014.3.0"

#define BATADV_SOURCE_VERSION "2014.4.0"

#endif



/* B.A.T.M.A.N. parameters */
@@ -238,21 +238,29 @@ enum batadv_dbg_level { 
int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)

__printf(2, 3);



#define batadv_dbg(type, bat_priv, fmt, arg...)			\

/* possibly ratelimited debug output */

#define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...)	\

	do {							\

		if (atomic_read(&bat_priv->log_level) & type)	\

		if (atomic_read(&bat_priv->log_level) & type && \

		    (!ratelimited || net_ratelimit()))		\

			batadv_debug_log(bat_priv, fmt, ## arg);\

	}							\

	while (0)

#else /* !CONFIG_BATMAN_ADV_DEBUG */

__printf(3, 4)

static inline void batadv_dbg(int type __always_unused,

__printf(4, 5)

static inline void _batadv_dbg(int type __always_unused,

			       struct batadv_priv *bat_priv __always_unused,

			       int ratelimited __always_unused,

			       const char *fmt __always_unused, ...)

{

}

#endif



#define batadv_dbg(type, bat_priv, arg...) \

	_batadv_dbg(type, bat_priv, 0, ## arg)

#define batadv_dbg_ratelimited(type, bat_priv, arg...) \

	_batadv_dbg(type, bat_priv, 1, ## arg)



#define batadv_info(net_dev, fmt, arg...)				\

	do {								\

		struct net_device *_netdev = (net_dev);                 \

net/batman-adv/routing.c

+9 −9
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, 
	if (batadv_tt_local_client_is_roaming(bat_priv, ethhdr->h_dest, vid)) {

		if (batadv_reroute_unicast_packet(bat_priv, unicast_packet,

						  ethhdr->h_dest, vid))

			net_ratelimited_function(batadv_dbg, BATADV_DBG_TT,

			batadv_dbg_ratelimited(BATADV_DBG_TT,

					       bat_priv,

					       "Rerouting unicast packet to %pM (dst=%pM): Local Roaming\n",

					       unicast_packet->dest,
@@ -752,7 +752,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, 
	 */

	if (batadv_reroute_unicast_packet(bat_priv, unicast_packet,

					  ethhdr->h_dest, vid)) {

		net_ratelimited_function(batadv_dbg, BATADV_DBG_TT, bat_priv,

		batadv_dbg_ratelimited(BATADV_DBG_TT, bat_priv,

				       "Rerouting unicast packet to %pM (dst=%pM): TTVN mismatch old_ttvn=%u new_ttvn=%u\n",

				       unicast_packet->dest, ethhdr->h_dest,

				       old_ttvn, curr_ttvn);

CRA Git | Maintained and supported by SUSTech CRA and CCSE