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

Commit 41d06b13 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 



Included changes:
- sysfs removal postponement during interface un-registration
- random32() function renaming
- struct refactoring
- kernel doc improvement
- deleyed_work initialisation clean up work
- copyright year and internal version number update
- kernel doc improvement

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1ad759d8 5ac2a177

net/batman-adv/bat_algo.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:

/* Copyright (C) 2011-2013 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner

 *

net/batman-adv/bat_iv_ogm.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:

/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *
@@ -123,7 +123,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) 
	unsigned int msecs;



	msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER;

	msecs += random32() % (2 * BATADV_JITTER);

	msecs += prandom_u32() % (2 * BATADV_JITTER);



	return jiffies + msecs_to_jiffies(msecs);

}
@@ -131,7 +131,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) 
/* when do we schedule a ogm packet to be sent */

static unsigned long batadv_iv_ogm_fwd_send_time(void)

{

	return jiffies + msecs_to_jiffies(random32() % (BATADV_JITTER / 2));

	return jiffies + msecs_to_jiffies(prandom_u32() % (BATADV_JITTER / 2));

}



/* apply hop penalty for a normal link */

net/batman-adv/bitarray.c

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:

/* Copyright (C) 2006-2013 B.A.T.M.A.N. contributors:

 *

 * Simon Wunderlich, Marek Lindner

 *

net/batman-adv/bitarray.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors:

/* Copyright (C) 2006-2013 B.A.T.M.A.N. contributors:

 *

 * Simon Wunderlich, Marek Lindner

 *

net/batman-adv/bridge_loop_avoidance.c

+55 −58
Original line number Diff line number Diff line 
/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors:

/* Copyright (C) 2011-2013 B.A.T.M.A.N. contributors:

 *

 * Simon Wunderlich

 *
@@ -34,13 +34,14 @@ 
static const uint8_t batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05};



static void batadv_bla_periodic_work(struct work_struct *work);

static void batadv_bla_send_announce(struct batadv_priv *bat_priv,

				     struct batadv_backbone_gw *backbone_gw);

static void

batadv_bla_send_announce(struct batadv_priv *bat_priv,

			 struct batadv_bla_backbone_gw *backbone_gw);



/* return the index of the claim */

static inline uint32_t batadv_choose_claim(const void *data, uint32_t size)

{

	struct batadv_claim *claim = (struct batadv_claim *)data;

	struct batadv_bla_claim *claim = (struct batadv_bla_claim *)data;

	uint32_t hash = 0;



	hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr));
@@ -57,7 +58,7 @@ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) 
static inline uint32_t batadv_choose_backbone_gw(const void *data,

						 uint32_t size)

{

	const struct batadv_claim *claim = (struct batadv_claim *)data;

	const struct batadv_bla_claim *claim = (struct batadv_bla_claim *)data;

	uint32_t hash = 0;



	hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr));
@@ -75,9 +76,9 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data, 
static int batadv_compare_backbone_gw(const struct hlist_node *node,

				      const void *data2)

{

	const void *data1 = container_of(node, struct batadv_backbone_gw,

	const void *data1 = container_of(node, struct batadv_bla_backbone_gw,

					 hash_entry);

	const struct batadv_backbone_gw *gw1 = data1, *gw2 = data2;

	const struct batadv_bla_backbone_gw *gw1 = data1, *gw2 = data2;



	if (!batadv_compare_eth(gw1->orig, gw2->orig))

		return 0;
@@ -92,9 +93,9 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, 
static int batadv_compare_claim(const struct hlist_node *node,

				const void *data2)

{

	const void *data1 = container_of(node, struct batadv_claim,

	const void *data1 = container_of(node, struct batadv_bla_claim,

					 hash_entry);

	const struct batadv_claim *cl1 = data1, *cl2 = data2;

	const struct batadv_bla_claim *cl1 = data1, *cl2 = data2;



	if (!batadv_compare_eth(cl1->addr, cl2->addr))

		return 0;
@@ -106,7 +107,8 @@ static int batadv_compare_claim(const struct hlist_node *node, 
}



/* free a backbone gw */

static void batadv_backbone_gw_free_ref(struct batadv_backbone_gw *backbone_gw)

static void

batadv_backbone_gw_free_ref(struct batadv_bla_backbone_gw *backbone_gw)

{

	if (atomic_dec_and_test(&backbone_gw->refcount))

		kfree_rcu(backbone_gw, rcu);
@@ -115,16 +117,16 @@ static void batadv_backbone_gw_free_ref(struct batadv_backbone_gw *backbone_gw) 
/* finally deinitialize the claim */

static void batadv_claim_free_rcu(struct rcu_head *rcu)

{

	struct batadv_claim *claim;

	struct batadv_bla_claim *claim;



	claim = container_of(rcu, struct batadv_claim, rcu);

	claim = container_of(rcu, struct batadv_bla_claim, rcu);



	batadv_backbone_gw_free_ref(claim->backbone_gw);

	kfree(claim);

}



/* free a claim, call claim_free_rcu if its the last reference */

static void batadv_claim_free_ref(struct batadv_claim *claim)

static void batadv_claim_free_ref(struct batadv_bla_claim *claim)

{

	if (atomic_dec_and_test(&claim->refcount))

		call_rcu(&claim->rcu, batadv_claim_free_rcu);
@@ -136,14 +138,15 @@ static void batadv_claim_free_ref(struct batadv_claim *claim) 
 * looks for a claim in the hash, and returns it if found

 * or NULL otherwise.

 */

static struct batadv_claim *batadv_claim_hash_find(struct batadv_priv *bat_priv,

						   struct batadv_claim *data)

static struct batadv_bla_claim

*batadv_claim_hash_find(struct batadv_priv *bat_priv,

			struct batadv_bla_claim *data)

{

	struct batadv_hashtable *hash = bat_priv->bla.claim_hash;

	struct hlist_head *head;

	struct hlist_node *node;

	struct batadv_claim *claim;

	struct batadv_claim *claim_tmp = NULL;

	struct batadv_bla_claim *claim;

	struct batadv_bla_claim *claim_tmp = NULL;

	int index;



	if (!hash)
@@ -176,15 +179,15 @@ static struct batadv_claim *batadv_claim_hash_find(struct batadv_priv *bat_priv, 
 *

 * Returns claim if found or NULL otherwise.

 */

static struct batadv_backbone_gw *

static struct batadv_bla_backbone_gw *

batadv_backbone_hash_find(struct batadv_priv *bat_priv,

			  uint8_t *addr, short vid)

{

	struct batadv_hashtable *hash = bat_priv->bla.backbone_hash;

	struct hlist_head *head;

	struct hlist_node *node;

	struct batadv_backbone_gw search_entry, *backbone_gw;

	struct batadv_backbone_gw *backbone_gw_tmp = NULL;

	struct batadv_bla_backbone_gw search_entry, *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw_tmp = NULL;

	int index;



	if (!hash)
@@ -215,12 +218,12 @@ batadv_backbone_hash_find(struct batadv_priv *bat_priv, 


/* delete all claims for a backbone */

static void

batadv_bla_del_backbone_claims(struct batadv_backbone_gw *backbone_gw)

batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw)

{

	struct batadv_hashtable *hash;

	struct hlist_node *node, *node_tmp;

	struct hlist_head *head;

	struct batadv_claim *claim;

	struct batadv_bla_claim *claim;

	int i;

	spinlock_t *list_lock;	/* protects write access to the hash lists */
@@ -364,11 +367,11 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
 * searches for the backbone gw or creates a new one if it could not

 * be found.

 */

static struct batadv_backbone_gw *

static struct batadv_bla_backbone_gw *

batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,

			   short vid, bool own_backbone)

{

	struct batadv_backbone_gw *entry;

	struct batadv_bla_backbone_gw *entry;

	struct batadv_orig_node *orig_node;

	int hash_added;
@@ -435,7 +438,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv, 
				  struct batadv_hard_iface *primary_if,

				  short vid)

{

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;



	backbone_gw = batadv_bla_get_backbone_gw(bat_priv,

						 primary_if->net_dev->dev_addr,
@@ -460,8 +463,8 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, 
	struct hlist_node *node;

	struct hlist_head *head;

	struct batadv_hashtable *hash;

	struct batadv_claim *claim;

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_claim *claim;

	struct batadv_bla_backbone_gw *backbone_gw;

	int i;



	batadv_dbg(BATADV_DBG_BLA, bat_priv,
@@ -500,7 +503,7 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, 
 * After the request, it will repeat all of his own claims and finally

 * send an announcement claim with which we can check again.

 */

static void batadv_bla_send_request(struct batadv_backbone_gw *backbone_gw)

static void batadv_bla_send_request(struct batadv_bla_backbone_gw *backbone_gw)

{

	/* first, remove all old entries */

	batadv_bla_del_backbone_claims(backbone_gw);
@@ -526,7 +529,7 @@ static void batadv_bla_send_request(struct batadv_backbone_gw *backbone_gw) 
 * places.

 */

static void batadv_bla_send_announce(struct batadv_priv *bat_priv,

				     struct batadv_backbone_gw *backbone_gw)

				     struct batadv_bla_backbone_gw *backbone_gw)

{

	uint8_t mac[ETH_ALEN];

	__be16 crc;
@@ -548,10 +551,10 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv, 
 */

static void batadv_bla_add_claim(struct batadv_priv *bat_priv,

				 const uint8_t *mac, const short vid,

				 struct batadv_backbone_gw *backbone_gw)

				 struct batadv_bla_backbone_gw *backbone_gw)

{

	struct batadv_claim *claim;

	struct batadv_claim search_claim;

	struct batadv_bla_claim *claim;

	struct batadv_bla_claim search_claim;

	int hash_added;



	memcpy(search_claim.addr, mac, ETH_ALEN);
@@ -613,7 +616,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
static void batadv_bla_del_claim(struct batadv_priv *bat_priv,

				 const uint8_t *mac, const short vid)

{

	struct batadv_claim search_claim, *claim;

	struct batadv_bla_claim search_claim, *claim;



	memcpy(search_claim.addr, mac, ETH_ALEN);

	search_claim.vid = vid;
@@ -639,7 +642,7 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, 
				  uint8_t *an_addr, uint8_t *backbone_addr,

				  short vid)

{

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;

	uint16_t crc;



	if (memcmp(an_addr, batadv_announce_mac, 4) != 0)
@@ -711,7 +714,7 @@ static int batadv_handle_unclaim(struct batadv_priv *bat_priv, 
				 uint8_t *backbone_addr,

				 uint8_t *claim_addr, short vid)

{

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;



	/* unclaim in any case if it is our own */

	if (primary_if && batadv_compare_eth(backbone_addr,
@@ -740,7 +743,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, 
			       uint8_t *backbone_addr, uint8_t *claim_addr,

			       short vid)

{

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;



	/* register the gateway if not yet available, and add the claim. */
@@ -954,7 +957,7 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, 
 */

static void batadv_bla_purge_backbone_gw(struct batadv_priv *bat_priv, int now)

{

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;

	struct hlist_node *node, *node_tmp;

	struct hlist_head *head;

	struct batadv_hashtable *hash;
@@ -1009,7 +1012,7 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv, 
				    struct batadv_hard_iface *primary_if,

				    int now)

{

	struct batadv_claim *claim;

	struct batadv_bla_claim *claim;

	struct hlist_node *node;

	struct hlist_head *head;

	struct batadv_hashtable *hash;
@@ -1058,7 +1061,7 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, 
				    struct batadv_hard_iface *primary_if,

				    struct batadv_hard_iface *oldif)

{

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;

	struct hlist_node *node;

	struct hlist_head *head;

	struct batadv_hashtable *hash;
@@ -1100,16 +1103,6 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, 
	}

}







/* (re)start the timer */

static void batadv_bla_start_timer(struct batadv_priv *bat_priv)

{

	INIT_DELAYED_WORK(&bat_priv->bla.work, batadv_bla_periodic_work);

	queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work,

			   msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));

}



/* periodic work to do:

 *  * purge structures when they are too old

 *  * send announcements
@@ -1121,7 +1114,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) 
	struct batadv_priv_bla *priv_bla;

	struct hlist_node *node;

	struct hlist_head *head;

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;

	struct batadv_hashtable *hash;

	struct batadv_hard_iface *primary_if;

	int i;
@@ -1180,7 +1173,8 @@ static void batadv_bla_periodic_work(struct work_struct *work) 
	if (primary_if)

		batadv_hardif_free_ref(primary_if);



	batadv_bla_start_timer(bat_priv);

	queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work,

			   msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));

}



/* The hash for claim and backbone hash receive the same key because they
@@ -1238,7 +1232,10 @@ int batadv_bla_init(struct batadv_priv *bat_priv) 


	batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hashes initialized\n");



	batadv_bla_start_timer(bat_priv);

	INIT_DELAYED_WORK(&bat_priv->bla.work, batadv_bla_periodic_work);



	queue_delayed_work(batadv_event_workqueue, &bat_priv->bla.work,

			   msecs_to_jiffies(BATADV_BLA_PERIOD_LENGTH));

	return 0;

}
@@ -1326,7 +1323,7 @@ int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig) 
	struct batadv_hashtable *hash = bat_priv->bla.backbone_hash;

	struct hlist_head *head;

	struct hlist_node *node;

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;

	int i;



	if (!atomic_read(&bat_priv->bridge_loop_avoidance))
@@ -1367,7 +1364,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, 
{

	struct ethhdr *ethhdr;

	struct vlan_ethhdr *vhdr;

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;

	short vid = -1;



	if (!atomic_read(&orig_node->bat_priv->bridge_loop_avoidance))
@@ -1438,7 +1435,7 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid, 
		  bool is_bcast)

{

	struct ethhdr *ethhdr;

	struct batadv_claim search_claim, *claim = NULL;

	struct batadv_bla_claim search_claim, *claim = NULL;

	struct batadv_hard_iface *primary_if;

	int ret;
@@ -1532,7 +1529,7 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid, 
int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)

{

	struct ethhdr *ethhdr;

	struct batadv_claim search_claim, *claim = NULL;

	struct batadv_bla_claim search_claim, *claim = NULL;

	struct batadv_hard_iface *primary_if;

	int ret = 0;
@@ -1608,7 +1605,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
	struct net_device *net_dev = (struct net_device *)seq->private;

	struct batadv_priv *bat_priv = netdev_priv(net_dev);

	struct batadv_hashtable *hash = bat_priv->bla.claim_hash;

	struct batadv_claim *claim;

	struct batadv_bla_claim *claim;

	struct batadv_hard_iface *primary_if;

	struct hlist_node *node;

	struct hlist_head *head;
@@ -1653,7 +1650,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
	struct net_device *net_dev = (struct net_device *)seq->private;

	struct batadv_priv *bat_priv = netdev_priv(net_dev);

	struct batadv_hashtable *hash = bat_priv->bla.backbone_hash;

	struct batadv_backbone_gw *backbone_gw;

	struct batadv_bla_backbone_gw *backbone_gw;

	struct batadv_hard_iface *primary_if;

	struct hlist_node *node;

	struct hlist_head *head;