Commit b8766e4e 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:

====================
Included changes:
- code restyling and beautification
- use int kernel types instead of C99
- update kereldoc
- prevent potential hlist double deletion of VLAN objects
- fix gw bandwidth calculation
- convert list to hlist when needed
- add lockdep_asserts calls in function with lock requirements
  described in kerneldoc
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dafc2199 854d2a63

net/batman-adv/bat_iv_ogm.c

+51 −51
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ enum batadv_dup_status { 
 * @lq_index: index to store the value at

 * @value: value to store in the ring buffer

 */

static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,

				   uint8_t value)

static void batadv_ring_buffer_set(u8 lq_recv[], u8 *lq_index, u8 value)

{

	lq_recv[*lq_index] = value;

	*lq_index = (*lq_index + 1) % BATADV_TQ_GLOBAL_WINDOW_SIZE;
@@ -91,12 +90,12 @@ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, 
 *

 * Returns computed average value.

 */

static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])

static u8 batadv_ring_buffer_avg(const u8 lq_recv[])

{

	const uint8_t *ptr;

	uint16_t count = 0;

	uint16_t i = 0;

	uint16_t sum = 0;

	const u8 *ptr;

	u16 count = 0;

	u16 i = 0;

	u16 sum = 0;



	ptr = lq_recv;
@@ -113,7 +112,7 @@ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[]) 
	if (count == 0)

		return 0;



	return (uint8_t)(sum / count);

	return (u8)(sum / count);

}



/**
@@ -155,14 +154,14 @@ 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_array(max_if_num, sizeof(uint8_t), GFP_ATOMIC);

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

	if (!data_ptr) {

		kfree(orig_node->bat_iv.bcast_own);

		goto unlock;

	}



	memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum,

	       (max_if_num - 1) * sizeof(uint8_t));

	       (max_if_num - 1) * sizeof(u8));

	kfree(orig_node->bat_iv.bcast_own_sum);

	orig_node->bat_iv.bcast_own_sum = data_ptr;
@@ -215,19 +214,19 @@ free_bcast_own: 
	if (max_if_num == 0)

		goto free_own_sum;



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

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

	if (!data_ptr) {

		kfree(orig_node->bat_iv.bcast_own);

		goto unlock;

	}



	memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum,

	       del_if_num * sizeof(uint8_t));

	       del_if_num * sizeof(u8));



	if_offset = (del_if_num + 1) * sizeof(uint8_t);

	memcpy((char *)data_ptr + del_if_num * sizeof(uint8_t),

	if_offset = (del_if_num + 1) * sizeof(u8);

	memcpy((char *)data_ptr + del_if_num * sizeof(u8),

	       orig_node->bat_iv.bcast_own_sum + if_offset,

	       (max_if_num - del_if_num) * sizeof(uint8_t));

	       (max_if_num - del_if_num) * sizeof(u8));



free_own_sum:

	kfree(orig_node->bat_iv.bcast_own_sum);
@@ -250,7 +249,7 @@ unlock: 
 * If the object does not exists it is created an initialised.

 */

static struct batadv_orig_node *

batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr)

batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr)

{

	struct batadv_orig_node *orig_node;

	int size, hash_added;
@@ -270,7 +269,7 @@ batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const uint8_t *addr) 
	if (!orig_node->bat_iv.bcast_own)

		goto free_orig_node;



	size = bat_priv->num_ifaces * sizeof(uint8_t);

	size = bat_priv->num_ifaces * sizeof(u8);

	orig_node->bat_iv.bcast_own_sum = kzalloc(size, GFP_ATOMIC);

	if (!orig_node->bat_iv.bcast_own_sum)

		goto free_orig_node;
@@ -293,7 +292,7 @@ free_orig_node: 


static struct batadv_neigh_node *

batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,

			const uint8_t *neigh_addr,

			const u8 *neigh_addr,

			struct batadv_orig_node *orig_node,

			struct batadv_orig_node *orig_neigh)

{
@@ -339,7 +338,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) 
{

	struct batadv_ogm_packet *batadv_ogm_packet;

	unsigned char *ogm_buff;

	uint32_t random_seqno;

	u32 random_seqno;



	/* randomize initial seqno to avoid collision */

	get_random_bytes(&random_seqno, sizeof(random_seqno));
@@ -411,8 +410,7 @@ static unsigned long batadv_iv_ogm_fwd_send_time(void) 
}



/* apply hop penalty for a normal link */

static uint8_t batadv_hop_penalty(uint8_t tq,

				  const struct batadv_priv *bat_priv)

static u8 batadv_hop_penalty(u8 tq, const struct batadv_priv *bat_priv)

{

	int hop_penalty = atomic_read(&bat_priv->hop_penalty);

	int new_tq;
@@ -442,11 +440,11 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, 
{

	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);

	const char *fwd_str;

	uint8_t packet_num;

	int16_t buff_pos;

	u8 packet_num;

	s16 buff_pos;

	struct batadv_ogm_packet *batadv_ogm_packet;

	struct sk_buff *skb;

	uint8_t *packet_pos;

	u8 *packet_pos;



	if (hard_iface->if_status != BATADV_IF_ACTIVE)

		return;
@@ -837,7 +835,7 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, 
				  struct batadv_hard_iface *if_outgoing)

{

	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	uint16_t tvlv_len;

	u16 tvlv_len;



	if (batadv_ogm_packet->ttl <= 1) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "ttl exceeded\n");
@@ -896,9 +894,9 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) 
	struct hlist_head *head;

	struct batadv_orig_node *orig_node;

	unsigned long *word;

	uint32_t i;

	u32 i;

	size_t word_index;

	uint8_t *w;

	u8 *w;

	int if_num;



	for (i = 0; i < hash->size; i++) {
@@ -927,8 +925,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) 
	struct batadv_ogm_packet *batadv_ogm_packet;

	struct batadv_hard_iface *primary_if, *tmp_hard_iface;

	int *ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len;

	uint32_t seqno;

	uint16_t tvlv_len = 0;

	u32 seqno;

	u16 tvlv_len = 0;

	unsigned long send_time;



	primary_if = batadv_primary_if_get_selected(bat_priv);
@@ -947,7 +945,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) 
	batadv_ogm_packet->tvlv_len = htons(tvlv_len);



	/* change sequence number to network order */

	seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);

	seqno = (u32)atomic_read(&hard_iface->bat_iv.ogm_seqno);

	batadv_ogm_packet->seqno = htonl(seqno);

	atomic_inc(&hard_iface->bat_iv.ogm_seqno);
@@ -1006,13 +1004,14 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
{

	struct batadv_neigh_ifinfo *neigh_ifinfo = NULL;

	struct batadv_neigh_ifinfo *router_ifinfo = NULL;

	struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;

	struct batadv_neigh_node *neigh_node = NULL;

	struct batadv_neigh_node *tmp_neigh_node = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_orig_node *orig_node_tmp;

	int if_num;

	uint8_t sum_orig, sum_neigh;

	uint8_t *neigh_addr;

	uint8_t tq_avg;

	u8 sum_orig, sum_neigh;

	u8 *neigh_addr;

	u8 tq_avg;



	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "update_originator(): Searching and updating originator entry of received packet\n");
@@ -1164,8 +1163,8 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, 
	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node;

	struct batadv_neigh_ifinfo *neigh_ifinfo;

	uint8_t total_count;

	uint8_t orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;

	u8 total_count;

	u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;

	unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;

	int tq_asym_penalty, inv_asym_penalty, if_num, ret = 0;

	unsigned int combined_tq;
@@ -1311,13 +1310,13 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, 
	struct batadv_neigh_node *neigh_node;

	struct batadv_neigh_ifinfo *neigh_ifinfo;

	int is_dup;

	int32_t seq_diff;

	s32 seq_diff;

	int need_update = 0;

	int set_mark;

	enum batadv_dup_status ret = BATADV_NO_DUP;

	uint32_t seqno = ntohl(batadv_ogm_packet->seqno);

	uint8_t *neigh_addr;

	uint8_t packet_count;

	u32 seqno = ntohl(batadv_ogm_packet->seqno);

	u8 *neigh_addr;

	u8 packet_count;

	unsigned long *bitmap;



	orig_node = batadv_iv_ogm_orig_get(bat_priv, batadv_ogm_packet->orig);
@@ -1406,7 +1405,8 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
				struct batadv_hard_iface *if_outgoing)

{

	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	struct batadv_neigh_node *router = NULL, *router_router = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_neigh_node *router_router = NULL;

	struct batadv_orig_node *orig_neigh_node;

	struct batadv_orig_ifinfo *orig_ifinfo;

	struct batadv_neigh_node *orig_neigh_router = NULL;
@@ -1418,7 +1418,7 @@ batadv_iv_ogm_process_per_outif(const struct sk_buff *skb, int ogm_offset, 
	bool sameseq, similar_ttl;

	struct sk_buff *skb_priv;

	struct ethhdr *ethhdr;

	uint8_t *prev_sender;

	u8 *prev_sender;

	int is_bidirect;



	/* create a private copy of the skb, as some functions change tq value
@@ -1600,7 +1600,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 
	struct batadv_orig_node *orig_neigh_node, *orig_node;

	struct batadv_hard_iface *hard_iface;

	struct batadv_ogm_packet *ogm_packet;

	uint32_t if_incoming_seqno;

	u32 if_incoming_seqno;

	bool has_directlink_flag;

	struct ethhdr *ethhdr;

	bool is_my_oldorig = false;
@@ -1673,9 +1673,9 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 
	if (is_my_orig) {

		unsigned long *word;

		int offset;

		int32_t bit_pos;

		int16_t if_num;

		uint8_t *weight;

		s32 bit_pos;

		s16 if_num;

		u8 *weight;



		orig_neigh_node = batadv_iv_ogm_orig_get(bat_priv,

							 ethhdr->h_source);
@@ -1751,7 +1751,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 
{

	struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	struct batadv_ogm_packet *ogm_packet;

	uint8_t *packet_pos;

	u8 *packet_pos;

	int ogm_offset;

	bool ret;
@@ -1835,7 +1835,7 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, 
	unsigned long last_seen_jiffies;

	struct hlist_head *head;

	int batman_count = 0;

	uint32_t i;

	u32 i;



	seq_printf(seq, "  %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",

		   "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE,
@@ -1903,7 +1903,7 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, 
				   struct batadv_hard_iface *if_outgoing2)

{

	struct batadv_neigh_ifinfo *neigh1_ifinfo, *neigh2_ifinfo;

	uint8_t tq1, tq2;

	u8 tq1, tq2;

	int diff;



	neigh1_ifinfo = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);
@@ -1945,7 +1945,7 @@ batadv_iv_ogm_neigh_is_eob(struct batadv_neigh_node *neigh1, 
			   struct batadv_hard_iface *if_outgoing2)

{

	struct batadv_neigh_ifinfo *neigh1_ifinfo, *neigh2_ifinfo;

	uint8_t tq1, tq2;

	u8 tq1, tq2;

	bool ret;



	neigh1_ifinfo = batadv_neigh_ifinfo_get(neigh1, if_outgoing1);

net/batman-adv/bitarray.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/bitmap.h>



/* shift the packet array by n places. */

static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n)

static void batadv_bitmap_shift_left(unsigned long *seq_bits, s32 n)

{

	if (n <= 0 || n >= BATADV_TQ_LOCAL_WINDOW_SIZE)

		return;
@@ -35,8 +35,8 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) 
 *  1 if the window was moved (either new or very old)

 *  0 if the window was not moved/shifted.

 */

int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,

			  int32_t seq_num_diff, int set_mark)

int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, s32 seq_num_diff,

			  int set_mark)

{

	struct batadv_priv *bat_priv = priv;

net/batman-adv/bitarray.h

+5 −5
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
 * and curr_seqno is within range of last_seqno. Otherwise returns 0.

 */

static inline int batadv_test_bit(const unsigned long *seq_bits,

				  uint32_t last_seqno, uint32_t curr_seqno)

				  u32 last_seqno, u32 curr_seqno)

{

	int32_t diff;

	s32 diff;



	diff = last_seqno - curr_seqno;

	if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE)
@@ -39,7 +39,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits, 
}



/* turn corresponding bit on, so we can remember that we got the packet */

static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n)

static inline void batadv_set_bit(unsigned long *seq_bits, s32 n)

{

	/* if too old, just drop it */

	if (n < 0 || n >= BATADV_TQ_LOCAL_WINDOW_SIZE)
@@ -51,7 +51,7 @@ static inline void batadv_set_bit(unsigned long *seq_bits, int32_t n) 
/* receive and process one packet, returns 1 if received seq_num is considered

 * new, 0 if old

 */

int batadv_bit_get_packet(void *priv, unsigned long *seq_bits,

			  int32_t seq_num_diff, int set_mark);

int batadv_bit_get_packet(void *priv, unsigned long *seq_bits, s32 seq_num_diff,

			  int set_mark);



#endif /* _NET_BATMAN_ADV_BITARRAY_H_ */

net/batman-adv/bridge_loop_avoidance.c

+39 −39
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include "packet.h"

#include "translation-table.h"



static const uint8_t batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05};

static const u8 batadv_announce_mac[4] = {0x43, 0x05, 0x43, 0x05};



static void batadv_bla_periodic_work(struct work_struct *work);

static void
@@ -59,10 +59,10 @@ 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)

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

{

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

	uint32_t hash = 0;

	u32 hash = 0;



	hash = jhash(&claim->addr, sizeof(claim->addr), hash);

	hash = jhash(&claim->vid, sizeof(claim->vid), hash);
@@ -71,11 +71,10 @@ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size) 
}



/* return the index of the backbone gateway */

static inline uint32_t batadv_choose_backbone_gw(const void *data,

						 uint32_t size)

static inline u32 batadv_choose_backbone_gw(const void *data, u32 size)

{

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

	uint32_t hash = 0;

	u32 hash = 0;



	hash = jhash(&claim->addr, sizeof(claim->addr), hash);

	hash = jhash(&claim->vid, sizeof(claim->vid), hash);
@@ -89,7 +88,8 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, 
{

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

					 hash_entry);

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

	const struct batadv_bla_backbone_gw *gw1 = data1;

	const struct batadv_bla_backbone_gw *gw2 = data2;



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

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

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

					 hash_entry);

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

	const struct batadv_bla_claim *cl1 = data1;

	const struct batadv_bla_claim *cl2 = data2;



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

		return 0;
@@ -192,8 +193,8 @@ static struct batadv_bla_claim 
 * Returns claim if found or NULL otherwise.

 */

static struct batadv_bla_backbone_gw *

batadv_backbone_hash_find(struct batadv_priv *bat_priv,

			  uint8_t *addr, unsigned short vid)

batadv_backbone_hash_find(struct batadv_priv *bat_priv, u8 *addr,

			  unsigned short vid)

{

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

	struct hlist_head *head;
@@ -269,14 +270,14 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) 
 * @vid: the VLAN ID

 * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)

 */

static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac,

static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,

				  unsigned short vid, int claimtype)

{

	struct sk_buff *skb;

	struct ethhdr *ethhdr;

	struct batadv_hard_iface *primary_if;

	struct net_device *soft_iface;

	uint8_t *hw_src;

	u8 *hw_src;

	struct batadv_bla_claim_dst local_claim_dest;

	__be32 zeroip = 0;
@@ -304,13 +305,13 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
			  * with XX   = claim type

			  * and YY:YY = group id

			  */

			 (uint8_t *)&local_claim_dest);

			 (u8 *)&local_claim_dest);



	if (!skb)

		goto out;



	ethhdr = (struct ethhdr *)skb->data;

	hw_src = (uint8_t *)ethhdr + ETH_HLEN + sizeof(struct arphdr);

	hw_src = (u8 *)ethhdr + ETH_HLEN + sizeof(struct arphdr);



	/* now we pretend that the client would have sent this ... */

	switch (claimtype) {
@@ -383,7 +384,7 @@ out: 
 * be found.

 */

static struct batadv_bla_backbone_gw *

batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,

batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig,

			   unsigned short vid, bool own_backbone)

{

	struct batadv_bla_backbone_gw *entry;
@@ -552,7 +553,7 @@ static void batadv_bla_send_request(struct batadv_bla_backbone_gw *backbone_gw) 
static void batadv_bla_send_announce(struct batadv_priv *bat_priv,

				     struct batadv_bla_backbone_gw *backbone_gw)

{

	uint8_t mac[ETH_ALEN];

	u8 mac[ETH_ALEN];

	__be16 crc;



	memcpy(mac, batadv_announce_mac, 4);
@@ -571,7 +572,7 @@ static void batadv_bla_send_announce(struct batadv_priv *bat_priv, 
 * @backbone_gw: the backbone gateway which claims it

 */

static void batadv_bla_add_claim(struct batadv_priv *bat_priv,

				 const uint8_t *mac, const unsigned short vid,

				 const u8 *mac, const unsigned short vid,

				 struct batadv_bla_backbone_gw *backbone_gw)

{

	struct batadv_bla_claim *claim;
@@ -635,7 +636,7 @@ claim_free_ref: 
 * given mac address and vid.

 */

static void batadv_bla_del_claim(struct batadv_priv *bat_priv,

				 const uint8_t *mac, const unsigned short vid)

				 const u8 *mac, const unsigned short vid)

{

	struct batadv_bla_claim search_claim, *claim;
@@ -659,12 +660,11 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, 
}



/* check for ANNOUNCE frame, return 1 if handled */

static int batadv_handle_announce(struct batadv_priv *bat_priv,

				  uint8_t *an_addr, uint8_t *backbone_addr,

				  unsigned short vid)

static int batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr,

				  u8 *backbone_addr, unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;

	uint16_t crc;

	u16 crc;



	if (memcmp(an_addr, batadv_announce_mac, 4) != 0)

		return 0;
@@ -708,8 +708,8 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, 
/* check for REQUEST frame, return 1 if handled */

static int batadv_handle_request(struct batadv_priv *bat_priv,

				 struct batadv_hard_iface *primary_if,

				 uint8_t *backbone_addr,

				 struct ethhdr *ethhdr, unsigned short vid)

				 u8 *backbone_addr, struct ethhdr *ethhdr,

				 unsigned short vid)

{

	/* check for REQUEST frame */

	if (!batadv_compare_eth(backbone_addr, ethhdr->h_dest))
@@ -732,8 +732,8 @@ static int batadv_handle_request(struct batadv_priv *bat_priv, 
/* check for UNCLAIM frame, return 1 if handled */

static int batadv_handle_unclaim(struct batadv_priv *bat_priv,

				 struct batadv_hard_iface *primary_if,

				 uint8_t *backbone_addr,

				 uint8_t *claim_addr, unsigned short vid)

				 u8 *backbone_addr, u8 *claim_addr,

				 unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;
@@ -761,7 +761,7 @@ static int batadv_handle_unclaim(struct batadv_priv *bat_priv, 
/* check for CLAIM frame, return 1 if handled */

static int batadv_handle_claim(struct batadv_priv *bat_priv,

			       struct batadv_hard_iface *primary_if,

			       uint8_t *backbone_addr, uint8_t *claim_addr,

			       u8 *backbone_addr, u8 *claim_addr,

			       unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;
@@ -805,10 +805,10 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, 
 */

static int batadv_check_claim_group(struct batadv_priv *bat_priv,

				    struct batadv_hard_iface *primary_if,

				    uint8_t *hw_src, uint8_t *hw_dst,

				    u8 *hw_src, u8 *hw_dst,

				    struct ethhdr *ethhdr)

{

	uint8_t *backbone_addr;

	u8 *backbone_addr;

	struct batadv_orig_node *orig_node;

	struct batadv_bla_claim_dst *bla_dst, *bla_dst_own;
@@ -877,7 +877,7 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, 
				    struct sk_buff *skb)

{

	struct batadv_bla_claim_dst *bla_dst, *bla_dst_own;

	uint8_t *hw_src, *hw_dst;

	u8 *hw_src, *hw_dst;

	struct vlan_hdr *vhdr, vhdr_buf;

	struct ethhdr *ethhdr;

	struct arphdr *arphdr;
@@ -923,7 +923,7 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, 


	/* pskb_may_pull() may have modified the pointers, get ethhdr again */

	ethhdr = eth_hdr(skb);

	arphdr = (struct arphdr *)((uint8_t *)ethhdr + headlen);

	arphdr = (struct arphdr *)((u8 *)ethhdr + headlen);



	/* Check whether the ARP frame carries a valid

	 * IP information
@@ -937,7 +937,7 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, 
	if (arphdr->ar_pln != 4)

		return 0;



	hw_src = (uint8_t *)arphdr + sizeof(struct arphdr);

	hw_src = (u8 *)arphdr + sizeof(struct arphdr);

	hw_dst = hw_src + ETH_ALEN + 4;

	bla_dst = (struct batadv_bla_claim_dst *)hw_dst;

	bla_dst_own = &bat_priv->bla.claim_dest;
@@ -1238,9 +1238,9 @@ static struct lock_class_key batadv_backbone_hash_lock_class_key; 
int batadv_bla_init(struct batadv_priv *bat_priv)

{

	int i;

	uint8_t claim_dest[ETH_ALEN] = {0xff, 0x43, 0x05, 0x00, 0x00, 0x00};

	u8 claim_dest[ETH_ALEN] = {0xff, 0x43, 0x05, 0x00, 0x00, 0x00};

	struct batadv_hard_iface *primary_if;

	uint16_t crc;

	u16 crc;

	unsigned long entrytime;



	spin_lock_init(&bat_priv->bla.bcast_duplist_lock);
@@ -1368,7 +1368,7 @@ out: 
 *

 * Returns true if orig is a backbone for this vid, false otherwise.

 */

bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig,

bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig,

				    unsigned short vid)

{

	struct batadv_hashtable *hash = bat_priv->bla.backbone_hash;
@@ -1647,9 +1647,9 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
	struct batadv_bla_claim *claim;

	struct batadv_hard_iface *primary_if;

	struct hlist_head *head;

	uint32_t i;

	u32 i;

	bool is_own;

	uint8_t *primary_addr;

	u8 *primary_addr;



	primary_if = batadv_seq_print_text_primary_if_get(seq);

	if (!primary_if)
@@ -1692,9 +1692,9 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
	struct batadv_hard_iface *primary_if;

	struct hlist_head *head;

	int secs, msecs;

	uint32_t i;

	u32 i;

	bool is_own;

	uint8_t *primary_addr;

	u8 *primary_addr;



	primary_if = batadv_seq_print_text_primary_if_get(seq);

	if (!primary_if)

net/batman-adv/bridge_loop_avoidance.h

+2 −6
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 


#include <linux/types.h>



struct batadv_hard_iface;

struct batadv_orig_node;

struct batadv_priv;

struct seq_file;

struct sk_buff;
@@ -38,7 +35,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, 
int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);

int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq,

					     void *offset);

bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig,

bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig,

				    unsigned short vid);

int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,

				   struct sk_buff *skb);
@@ -84,8 +81,7 @@ static inline int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, 
}



static inline bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv,

						  uint8_t *orig,

						  unsigned short vid)

						  u8 *orig, unsigned short vid)

{

	return false;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE