Commit a230e033 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:
- reduce broadcast overhead on non-lossy wired links
- fix typos in kernel doc
- use eth_hdr() when possible
- use netdev_allock_skb_ip_align() and don't deal with NET_IP_ALIGN
- change VID semantic in the BLA component
- other minor cleanups and code refactoring

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cbb963de 6715fd3f

net/batman-adv/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ batman-adv-y += icmp_socket.o 
batman-adv-y += main.o

batman-adv-$(CONFIG_BATMAN_ADV_NC) += network-coding.o

batman-adv-y += originator.o

batman-adv-y += ring_buffer.o

batman-adv-y += routing.o

batman-adv-y += send.o

batman-adv-y += soft-interface.o

net/batman-adv/bat_iv_ogm.c

+88 −34
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include "main.h"

#include "translation-table.h"

#include "ring_buffer.h"

#include "originator.h"

#include "routing.h"

#include "gateway_common.h"
@@ -29,16 +28,57 @@ 
#include "bat_algo.h"

#include "network-coding.h"



/**

 * batadv_ring_buffer_set - update the ring buffer with the given value

 * @lq_recv: pointer to the ring buffer

 * @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)

{

	lq_recv[*lq_index] = value;

	*lq_index = (*lq_index + 1) % BATADV_TQ_GLOBAL_WINDOW_SIZE;

}



/**

 * batadv_ring_buffer_set - compute the average of all non-zero values stored

 * in the given ring buffer

 * @lq_recv: pointer to the ring buffer

 *

 * Returns computed average value.

 */

static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])

{

	const uint8_t *ptr;

	uint16_t count = 0, i = 0, sum = 0;



	ptr = lq_recv;



	while (i < BATADV_TQ_GLOBAL_WINDOW_SIZE) {

		if (*ptr != 0) {

			count++;

			sum += *ptr;

		}



		i++;

		ptr++;

	}



	if (count == 0)

		return 0;



	return (uint8_t)(sum / count);

}

static struct batadv_neigh_node *

batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,

			const uint8_t *neigh_addr,

			struct batadv_orig_node *orig_node,

			struct batadv_orig_node *orig_neigh, __be32 seqno)

			struct batadv_orig_node *orig_neigh)

{

	struct batadv_neigh_node *neigh_node;



	neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr,

					   ntohl(seqno));

	neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr);

	if (!neigh_node)

		goto out;
@@ -413,18 +453,16 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, 
	else

		skb_size = packet_len;



	skb_size += ETH_HLEN + NET_IP_ALIGN;

	skb_size += ETH_HLEN;



	forw_packet_aggr->skb = dev_alloc_skb(skb_size);

	forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size);

	if (!forw_packet_aggr->skb) {

		if (!own_packet)

			atomic_inc(&bat_priv->batman_queue_left);

		kfree(forw_packet_aggr);

		goto out;

	}

	skb_reserve(forw_packet_aggr->skb, ETH_HLEN + NET_IP_ALIGN);



	INIT_HLIST_NODE(&forw_packet_aggr->list);

	skb_reserve(forw_packet_aggr->skb, ETH_HLEN);



	skb_buff = skb_put(forw_packet_aggr->skb, packet_len);

	forw_packet_aggr->packet_len = packet_len;
@@ -590,6 +628,41 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, 
				if_incoming, 0, batadv_iv_ogm_fwd_send_time());

}



/**

 * batadv_iv_ogm_slide_own_bcast_window - bitshift own OGM broadcast windows for

 * the given interface

 * @hard_iface: the interface for which the windows have to be shifted

 */

static void

batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface)

{

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

	struct batadv_hashtable *hash = bat_priv->orig_hash;

	struct hlist_head *head;

	struct batadv_orig_node *orig_node;

	unsigned long *word;

	uint32_t i;

	size_t word_index;

	uint8_t *w;



	for (i = 0; i < hash->size; i++) {

		head = &hash->table[i];



		rcu_read_lock();

		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {

			spin_lock_bh(&orig_node->ogm_cnt_lock);

			word_index = hard_iface->if_num * BATADV_NUM_WORDS;

			word = &(orig_node->bcast_own[word_index]);



			batadv_bit_get_packet(bat_priv, word, 1, 0);

			w = &orig_node->bcast_own_sum[hard_iface->if_num];

			*w = bitmap_weight(word, BATADV_TQ_LOCAL_WINDOW_SIZE);

			spin_unlock_bh(&orig_node->ogm_cnt_lock);

		}

		rcu_read_unlock();

	}

}



static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)

{

	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
@@ -634,7 +707,7 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) 
		batadv_ogm_packet->gw_flags = BATADV_NO_FLAGS;

	}



	batadv_slide_own_bcast_window(hard_iface);

	batadv_iv_ogm_slide_own_bcast_window(hard_iface);

	batadv_iv_ogm_queue_add(bat_priv, hard_iface->bat_iv.ogm_buff,

				hard_iface->bat_iv.ogm_buff_len, hard_iface, 1,

				batadv_iv_ogm_emit_send_time(bat_priv));
@@ -670,7 +743,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 
		if (batadv_compare_eth(neigh_addr, ethhdr->h_source) &&

		    tmp_neigh_node->if_incoming == if_incoming &&

		    atomic_inc_not_zero(&tmp_neigh_node->refcount)) {

			if (neigh_node)

			if (WARN(neigh_node, "too many matching neigh_nodes"))

				batadv_neigh_node_free_ref(neigh_node);

			neigh_node = tmp_neigh_node;

			continue;
@@ -696,8 +769,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, 


		neigh_node = batadv_iv_ogm_neigh_new(if_incoming,

						     ethhdr->h_source,

						     orig_node, orig_tmp,

						     batadv_ogm_packet->seqno);

						     orig_node, orig_tmp);



		batadv_orig_node_free_ref(orig_tmp);

		if (!neigh_node)
@@ -829,8 +901,7 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, 
		neigh_node = batadv_iv_ogm_neigh_new(if_incoming,

						     orig_neigh_node->orig,

						     orig_neigh_node,

						     orig_neigh_node,

						     batadv_ogm_packet->seqno);

						     orig_neigh_node);



	if (!neigh_node)

		goto out;
@@ -991,7 +1062,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
	struct batadv_neigh_node *orig_neigh_router = NULL;

	int has_directlink_flag;

	int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;

	int is_broadcast = 0, is_bidirect;

	int is_bidirect;

	bool is_single_hop_neigh = false;

	bool is_from_best_next_hop = false;

	int is_duplicate, sameseq, simlar_ttl;
@@ -1054,19 +1125,9 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
		if (batadv_compare_eth(batadv_ogm_packet->prev_sender,

				       hard_iface->net_dev->dev_addr))

			is_my_oldorig = 1;



		if (is_broadcast_ether_addr(ethhdr->h_source))

			is_broadcast = 1;

	}

	rcu_read_unlock();



	if (batadv_ogm_packet->header.version != BATADV_COMPAT_VERSION) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: incompatible batman version (%i)\n",

			   batadv_ogm_packet->header.version);

		return;

	}



	if (is_my_addr) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: received my own broadcast (sender: %pM)\n",
@@ -1074,13 +1135,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
		return;

	}



	if (is_broadcast) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "Drop packet: ignoring all packets with broadcast source addr (sender: %pM)\n",

			   ethhdr->h_source);

		return;

	}



	if (is_my_orig) {

		unsigned long *word;

		int offset;
@@ -1288,7 +1342,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, 
			   skb->len + ETH_HLEN);



	packet_len = skb_headlen(skb);

	ethhdr = (struct ethhdr *)skb_mac_header(skb);

	ethhdr = eth_hdr(skb);

	packet_buff = skb->data;

	batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff;

net/batman-adv/bridge_loop_avoidance.c

+51 −43
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static struct batadv_bla_claim 
 */

static struct batadv_bla_backbone_gw *

batadv_backbone_hash_find(struct batadv_priv *bat_priv,

			  uint8_t *addr, short vid)

			  uint8_t *addr, unsigned short vid)

{

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

	struct hlist_head *head;
@@ -257,7 +257,7 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) 
 * @claimtype: the type of the claim (CLAIM, UNCLAIM, ANNOUNCE, ...)

 */

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

				  short vid, int claimtype)

				  unsigned short vid, int claimtype)

{

	struct sk_buff *skb;

	struct ethhdr *ethhdr;
@@ -307,7 +307,8 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		 */

		memcpy(ethhdr->h_source, mac, ETH_ALEN);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

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

			   BATADV_PRINT_VID(vid));

		break;

	case BATADV_CLAIM_TYPE_UNCLAIM:

		/* unclaim frame
@@ -316,7 +317,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		memcpy(hw_src, mac, ETH_ALEN);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

			   vid);

			   BATADV_PRINT_VID(vid));

		break;

	case BATADV_CLAIM_TYPE_ANNOUNCE:

		/* announcement frame
@@ -325,7 +326,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		memcpy(hw_src, mac, ETH_ALEN);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

			   ethhdr->h_source, vid);

			   ethhdr->h_source, BATADV_PRINT_VID(vid));

		break;

	case BATADV_CLAIM_TYPE_REQUEST:

		/* request frame
@@ -336,12 +337,14 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		memcpy(ethhdr->h_dest, mac, ETH_ALEN);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

			   ethhdr->h_source, ethhdr->h_dest, vid);

			   ethhdr->h_source, ethhdr->h_dest,

			   BATADV_PRINT_VID(vid));

		break;

	}



	if (vid != -1)

		skb = vlan_insert_tag(skb, htons(ETH_P_8021Q), vid);

	if (vid & BATADV_VLAN_HAS_TAG)

		skb = vlan_insert_tag(skb, htons(ETH_P_8021Q),

				      vid & VLAN_VID_MASK);



	skb_reset_mac_header(skb);

	skb->protocol = eth_type_trans(skb, soft_iface);
@@ -367,7 +370,7 @@ out: 
 */

static struct batadv_bla_backbone_gw *

batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig,

			   short vid, bool own_backbone)

			   unsigned short vid, bool own_backbone)

{

	struct batadv_bla_backbone_gw *entry;

	struct batadv_orig_node *orig_node;
@@ -380,7 +383,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, 


	batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

		   orig, vid);

		   orig, BATADV_PRINT_VID(vid));



	entry = kzalloc(sizeof(*entry), GFP_ATOMIC);

	if (!entry)
@@ -434,7 +437,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, 
static void

batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,

				  struct batadv_hard_iface *primary_if,

				  short vid)

				  unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;
@@ -456,7 +459,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv, 
 */

static void batadv_bla_answer_request(struct batadv_priv *bat_priv,

				      struct batadv_hard_iface *primary_if,

				      short vid)

				      unsigned short vid)

{

	struct hlist_head *head;

	struct batadv_hashtable *hash;
@@ -547,7 +550,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 short vid,

				 const uint8_t *mac, const unsigned short vid,

				 struct batadv_bla_backbone_gw *backbone_gw)

{

	struct batadv_bla_claim *claim;
@@ -572,7 +575,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
		atomic_set(&claim->refcount, 2);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

			   mac, vid);

			   mac, BATADV_PRINT_VID(vid));

		hash_added = batadv_hash_add(bat_priv->bla.claim_hash,

					     batadv_compare_claim,

					     batadv_choose_claim, claim,
@@ -591,7 +594,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 


		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

			   mac, vid);

			   mac, BATADV_PRINT_VID(vid));



		claim->backbone_gw->crc ^= crc16(0, claim->addr, ETH_ALEN);

		batadv_backbone_gw_free_ref(claim->backbone_gw);
@@ -611,7 +614,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 short vid)

				 const uint8_t *mac, const unsigned short vid)

{

	struct batadv_bla_claim search_claim, *claim;
@@ -622,7 +625,7 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, 
		return;



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

		   mac, vid);

		   mac, BATADV_PRINT_VID(vid));



	batadv_hash_remove(bat_priv->bla.claim_hash, batadv_compare_claim,

			   batadv_choose_claim, claim);
@@ -637,7 +640,7 @@ 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,

				  short vid)

				  unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;

	uint16_t crc;
@@ -658,12 +661,13 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, 


	batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

		   vid, backbone_gw->orig, crc);

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



	if (backbone_gw->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, backbone_gw->vid,

			   backbone_gw->orig,

			   BATADV_PRINT_VID(backbone_gw->vid),

			   backbone_gw->crc, crc);



		batadv_bla_send_request(backbone_gw);
@@ -685,7 +689,7 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, 
static int batadv_handle_request(struct batadv_priv *bat_priv,

				 struct batadv_hard_iface *primary_if,

				 uint8_t *backbone_addr,

				 struct ethhdr *ethhdr, short vid)

				 struct ethhdr *ethhdr, unsigned short vid)

{

	/* check for REQUEST frame */

	if (!batadv_compare_eth(backbone_addr, ethhdr->h_dest))
@@ -699,7 +703,7 @@ static int batadv_handle_request(struct batadv_priv *bat_priv, 


	batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

		   vid, ethhdr->h_source);

		   BATADV_PRINT_VID(vid), ethhdr->h_source);



	batadv_bla_answer_request(bat_priv, primary_if, vid);

	return 1;
@@ -709,7 +713,7 @@ static int batadv_handle_request(struct batadv_priv *bat_priv, 
static int batadv_handle_unclaim(struct batadv_priv *bat_priv,

				 struct batadv_hard_iface *primary_if,

				 uint8_t *backbone_addr,

				 uint8_t *claim_addr, short vid)

				 uint8_t *claim_addr, unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;
@@ -727,7 +731,7 @@ static int 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",

		   claim_addr, vid, backbone_gw->orig);

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



	batadv_bla_del_claim(bat_priv, claim_addr, vid);

	batadv_backbone_gw_free_ref(backbone_gw);
@@ -738,7 +742,7 @@ static int batadv_handle_unclaim(struct batadv_priv *bat_priv, 
static int batadv_handle_claim(struct batadv_priv *bat_priv,

			       struct batadv_hard_iface *primary_if,

			       uint8_t *backbone_addr, uint8_t *claim_addr,

			       short vid)

			       unsigned short vid)

{

	struct batadv_bla_backbone_gw *backbone_gw;
@@ -861,14 +865,15 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, 
	struct batadv_bla_claim_dst *bla_dst;

	uint16_t proto;

	int headlen;

	short vid = -1;

	unsigned short vid = BATADV_NO_FLAGS;

	int ret;



	ethhdr = (struct ethhdr *)skb_mac_header(skb);

	ethhdr = eth_hdr(skb);



	if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) {

		vhdr = (struct vlan_ethhdr *)ethhdr;

		vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;

		vid |= BATADV_VLAN_HAS_TAG;

		proto = ntohs(vhdr->h_vlan_encapsulated_proto);

		headlen = sizeof(*vhdr);

	} else {
@@ -885,7 +890,7 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, 
		return 0;



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

	ethhdr = (struct ethhdr *)skb_mac_header(skb);

	ethhdr = eth_hdr(skb);

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



	/* Check whether the ARP frame carries a valid
@@ -910,7 +915,8 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, 
	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, vid, hw_src, hw_dst);

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

			   hw_dst);



	if (ret < 2)

		return ret;
@@ -945,7 +951,7 @@ static int 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, vid, hw_src, hw_dst);

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

	return 1;

}
@@ -1358,7 +1364,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, 
	struct ethhdr *ethhdr;

	struct vlan_ethhdr *vhdr;

	struct batadv_bla_backbone_gw *backbone_gw;

	short vid = -1;

	unsigned short vid = BATADV_NO_FLAGS;



	if (!atomic_read(&orig_node->bat_priv->bridge_loop_avoidance))

		return 0;
@@ -1375,6 +1381,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, 


		vhdr = (struct vlan_ethhdr *)(skb->data + hdr_size);

		vid = ntohs(vhdr->h_vlan_TCI) & VLAN_VID_MASK;

		vid |= BATADV_VLAN_HAS_TAG;

	}



	/* see if this originator is a backbone gw for this VLAN */
@@ -1424,15 +1431,15 @@ void batadv_bla_free(struct batadv_priv *bat_priv) 
 * returns 1, otherwise it returns 0 and the caller shall further

 * process the skb.

 */

int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,

		  bool is_bcast)

int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,

		  unsigned short vid, bool is_bcast)

{

	struct ethhdr *ethhdr;

	struct batadv_bla_claim search_claim, *claim = NULL;

	struct batadv_hard_iface *primary_if;

	int ret;



	ethhdr = (struct ethhdr *)skb_mac_header(skb);

	ethhdr = eth_hdr(skb);



	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (!primary_if)
@@ -1519,7 +1526,8 @@ out: 
 * returns 1, otherwise it returns 0 and the caller shall further

 * process the skb.

 */

int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)

int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,

		  unsigned short vid)

{

	struct ethhdr *ethhdr;

	struct batadv_bla_claim search_claim, *claim = NULL;
@@ -1539,7 +1547,7 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid) 
	if (batadv_bla_process_claim(bat_priv, primary_if, skb))

		goto handled;



	ethhdr = (struct ethhdr *)skb_mac_header(skb);

	ethhdr = eth_hdr(skb);



	if (unlikely(atomic_read(&bat_priv->bla.num_requests)))

		/* don't allow broadcasts while requests are in flight */
@@ -1624,7 +1632,7 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
			is_own = batadv_compare_eth(claim->backbone_gw->orig,

						    primary_addr);

			seq_printf(seq, " * %pM on %5d by %pM [%c] (%#.4x)\n",

				   claim->addr, claim->vid,

				   claim->addr, BATADV_PRINT_VID(claim->vid),

				   claim->backbone_gw->orig,

				   (is_own ? 'x' : ' '),

				   claim->backbone_gw->crc);
@@ -1676,10 +1684,10 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
			if (is_own)

				continue;



			seq_printf(seq,

				   " * %pM on % 5d % 4i.%03is (%#.4x)\n",

				   backbone_gw->orig, backbone_gw->vid,

				   secs, msecs, backbone_gw->crc);

			seq_printf(seq, " * %pM on %5d %4i.%03is (%#.4x)\n",

				   backbone_gw->orig,

				   BATADV_PRINT_VID(backbone_gw->vid), secs,

				   msecs, backbone_gw->crc);

		}

		rcu_read_unlock();

	}

net/batman-adv/bridge_loop_avoidance.h

+7 −5
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ 
#define _NET_BATMAN_ADV_BLA_H_



#ifdef CONFIG_BATMAN_ADV_BLA

int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,

		  bool is_bcast);

int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid);

int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,

		  unsigned short vid, bool is_bcast);

int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,

		  unsigned short vid);

int batadv_bla_is_backbone_gw(struct sk_buff *skb,

			      struct batadv_orig_node *orig_node, int hdr_size);

int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
@@ -42,13 +43,14 @@ void batadv_bla_free(struct batadv_priv *bat_priv); 
#else /* ifdef CONFIG_BATMAN_ADV_BLA */



static inline int batadv_bla_rx(struct batadv_priv *bat_priv,

				struct sk_buff *skb, short vid, bool is_bcast)

				struct sk_buff *skb, unsigned short vid,

				bool is_bcast)

{

	return 0;

}



static inline int batadv_bla_tx(struct batadv_priv *bat_priv,

				struct sk_buff *skb, short vid)

				struct sk_buff *skb, unsigned short vid)

{

	return 0;

}

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

+39 −43

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE