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

Commit fb57720d 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:
- remove useless return in void functions
- remove unused member 'primary_iface' from 'struct orig_node'
- improve existing kernel doc
- fix several checkpatch complaints
- ensure socket's control block is cleared for received skbs
- add missing DEBUG_FS dependency to BATMAN_ADV_DEBUG symbol

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f40e74ff 95353956

net/batman-adv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ config BATMAN_ADV_MCAST 
config BATMAN_ADV_DEBUG

	bool "B.A.T.M.A.N. debugging"

	depends on BATMAN_ADV

	depends on DEBUG_FS

	help

	  This is an option for use by developers; most people should

	  say N here. This enables compilation of support for

net/batman-adv/bat_iv_ogm.c

+7 −8
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ 
#include "bat_algo.h"

#include "network-coding.h"





/**

 * batadv_dup_status - duplicate status

 * enum batadv_dup_status - duplicate status

 * @BATADV_NO_DUP: the packet is a duplicate

 * @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the

 *  neighbor)
@@ -517,7 +516,7 @@ static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) 
 * @bat_priv: the bat priv with all the soft interface information

 * @packet_len: (total) length of the OGM

 * @send_time: timestamp (jiffies) when the packet is to be sent

 * @direktlink: true if this is a direct link packet

 * @directlink: true if this is a direct link packet

 * @if_incoming: interface where the packet was received

 * @if_outgoing: interface for which the retransmission should be considered

 * @forw_packet: the forwarded packet which should be checked
@@ -879,7 +878,7 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) 
		hlist_for_each_entry_rcu(orig_node, head, hash_entry) {

			spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock);

			word_index = hard_iface->if_num * BATADV_NUM_WORDS;

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

			word = &orig_node->bat_iv.bcast_own[word_index];



			batadv_bit_get_packet(bat_priv, word, 1, 0);

			if_num = hard_iface->if_num;
@@ -1362,10 +1361,10 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, 
	return ret;

}





/**

 * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if

 * @skb: the skb containing the OGM

 * @ogm_offset: offset from skb->data to start of ogm header

 * @orig_node: the (cached) orig node for the originator of this OGM

 * @if_incoming: the interface where this packet was received

 * @if_outgoing: the interface for which the packet should be considered
@@ -1664,7 +1663,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, 
			offset = if_num * BATADV_NUM_WORDS;



			spin_lock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock);

			word = &(orig_neigh_node->bat_iv.bcast_own[offset]);

			word = &orig_neigh_node->bat_iv.bcast_own[offset];

			bit_pos = if_incoming_seqno - 2;

			bit_pos -= ntohl(ogm_packet->seqno);

			batadv_set_bit(word, bit_pos);
@@ -1902,10 +1901,10 @@ static int batadv_iv_ogm_neigh_cmp(struct batadv_neigh_node *neigh1, 
 * batadv_iv_ogm_neigh_is_eob - check if neigh1 is equally good or better than

 *  neigh2 from the metric prospective

 * @neigh1: the first neighbor object of the comparison

 * @if_outgoing: outgoing interface for the first neighbor

 * @if_outgoing1: outgoing interface for the first neighbor

 * @neigh2: the second neighbor object of the comparison

 * @if_outgoing2: outgoing interface for the second neighbor



 *

 * Returns true if the metric via neigh1 is equally good or better than

 * the metric via neigh2, false otherwise.

 */

net/batman-adv/bitarray.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ static void batadv_bitmap_shift_left(unsigned long *seq_bits, int32_t n) 
	bitmap_shift_left(seq_bits, seq_bits, n, BATADV_TQ_LOCAL_WINDOW_SIZE);

}





/* receive and process one packet within the sequence number window.

 *

 * returns:

net/batman-adv/bitarray.h

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ static inline int batadv_test_bit(const unsigned long *seq_bits, 
	diff = last_seqno - curr_seqno;

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

		return 0;

	else

	return test_bit(diff, seq_bits) != 0;

}

net/batman-adv/bridge_loop_avoidance.c

+7 −10
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static inline uint32_t batadv_choose_backbone_gw(const void *data, 
	return hash % size;

}





/* compares address and vid of two backbone gws */

static int batadv_compare_backbone_gw(const struct hlist_node *node,

				      const void *data2)
@@ -245,14 +244,14 @@ batadv_bla_del_backbone_claims(struct batadv_bla_backbone_gw *backbone_gw) 
		spin_unlock_bh(list_lock);

	}



	/* all claims gone, intialize CRC */

	/* all claims gone, initialize CRC */

	backbone_gw->crc = BATADV_BLA_CRC_INIT;

}



/**

 * batadv_bla_send_claim - sends a claim frame according to the provided info

 * @bat_priv: the bat priv with all the soft interface information

 * @orig: the mac address to be announced within the claim

 * @mac: the mac address to be announced within the claim

 * @vid: the VLAN ID

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

 */
@@ -364,6 +363,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
 * @bat_priv: the bat priv with all the soft interface information

 * @orig: the mac address of the originator

 * @vid: the VLAN ID

 * @own_backbone: set if the requested backbone is local

 *

 * searches for the backbone gw or creates a new one if it could not

 * be found.
@@ -454,6 +454,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv, 
/**

 * batadv_bla_answer_request - answer a bla request by sending own claims

 * @bat_priv: the bat priv with all the soft interface information

 * @primary_if: interface where the request came on

 * @vid: the vid where the request came on

 *

 * Repeat all of our own claims, and finally send an ANNOUNCE frame
@@ -660,7 +661,6 @@ static int batadv_handle_announce(struct batadv_priv *bat_priv, 
	if (unlikely(!backbone_gw))

		return 1;





	/* handle as ANNOUNCE frame */

	backbone_gw->lasttime = jiffies;

	crc = ntohs(*((__be16 *)(&an_addr[4])));
@@ -775,6 +775,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, 
/**

 * batadv_check_claim_group

 * @bat_priv: the bat priv with all the soft interface information

 * @primary_if: the primary interface of this batman interface

 * @hw_src: the Hardware source in the ARP Header

 * @hw_dst: the Hardware destination in the ARP Header

 * @ethhdr: pointer to the Ethernet header of the claim frame
@@ -846,10 +847,10 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, 
	return 2;

}





/**

 * batadv_bla_process_claim

 * @bat_priv: the bat priv with all the soft interface information

 * @primary_if: the primary hard interface of this batman soft interface

 * @skb: the frame to be checked

 *

 * Check if this is a claim frame, and process it accordingly.
@@ -1327,7 +1328,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, 
		goto out;

	}

	/* not found, add a new entry (overwrite the oldest entry)

	 * and allow it, its the first occurence.

	 * and allow it, its the first occurrence.

	 */

	curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1);

	curr %= BATADV_DUPLIST_SIZE;
@@ -1343,8 +1344,6 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, 
	return ret;

}







/**

 * batadv_bla_is_backbone_gw_orig

 * @bat_priv: the bat priv with all the soft interface information
@@ -1386,7 +1385,6 @@ bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig, 
	return false;

}





/**

 * batadv_bla_is_backbone_gw

 * @skb: the frame to be checked
@@ -1476,7 +1474,6 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
	if (!atomic_read(&bat_priv->bridge_loop_avoidance))

		goto allow;





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

		/* don't allow broadcasts while requests are in flight */

		if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast)