Commit d5d80ac7 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: keep skb crc32 helper local in BLA 



The batadv_skb_crc32() helper was shared between Bridge Loop Avoidance and
Network Coding. With the removal of the network coding feature, it is
possible to just move this helper directly to Bridge Loop Avoidance.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 87b95082

net/batman-adv/bridge_loop_avoidance.c

+34 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/compiler.h>

#include <linux/container_of.h>

#include <linux/crc16.h>

#include <linux/crc32.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>
@@ -1584,6 +1585,39 @@ int batadv_bla_init(struct batadv_priv *bat_priv) 
	return 0;

}



/**

 * batadv_skb_crc32() - calculate CRC32 of the whole packet and skip bytes in

 *  the header

 * @skb: skb pointing to fragmented socket buffers

 * @payload_ptr: Pointer to position inside the head buffer of the skb

 *  marking the start of the data to be CRC'ed

 *

 * payload_ptr must always point to an address in the skb head buffer and not to

 * a fragment.

 *

 * Return: big endian crc32c of the checksummed data

 */

static __be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr)

{

	unsigned int to = skb->len;

	unsigned int consumed = 0;

	struct skb_seq_state st;

	unsigned int from;

	unsigned int len;

	const u8 *data;

	u32 crc = 0;



	from = (unsigned int)(payload_ptr - skb->data);



	skb_prepare_seq_read(skb, from, to, &st);

	while ((len = skb_seq_read(consumed, &data, &st)) != 0) {

		crc = crc32c(crc, data, len);

		consumed += len;

	}



	return htonl(crc);

}



/**

 * batadv_bla_check_duplist() - Check if a frame is in the broadcast dup.

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

net/batman-adv/main.c

+0 −34
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/build_bug.h>

#include <linux/byteorder/generic.h>

#include <linux/container_of.h>

#include <linux/crc32.h>

#include <linux/device.h>

#include <linux/errno.h>

#include <linux/gfp.h>
@@ -561,39 +560,6 @@ void batadv_recv_handler_unregister(u8 packet_type) 
	batadv_rx_handler[packet_type] = batadv_recv_unhandled_packet;

}



/**

 * batadv_skb_crc32() - calculate CRC32 of the whole packet and skip bytes in

 *  the header

 * @skb: skb pointing to fragmented socket buffers

 * @payload_ptr: Pointer to position inside the head buffer of the skb

 *  marking the start of the data to be CRC'ed

 *

 * payload_ptr must always point to an address in the skb head buffer and not to

 * a fragment.

 *

 * Return: big endian crc32c of the checksummed data

 */

__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr)

{

	u32 crc = 0;

	unsigned int from;

	unsigned int to = skb->len;

	struct skb_seq_state st;

	const u8 *data;

	unsigned int len;

	unsigned int consumed = 0;



	from = (unsigned int)(payload_ptr - skb->data);



	skb_prepare_seq_read(skb, from, to, &st);

	while ((len = skb_seq_read(consumed, &data, &st)) != 0) {

		crc = crc32c(crc, data, len);

		consumed += len;

	}



	return htonl(crc);

}



/**

 * batadv_get_vid() - extract the VLAN identifier from skb if any

 * @skb: the buffer containing the packet

net/batman-adv/main.h

+0 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ batadv_recv_handler_register(u8 packet_type, 
			     int (*recv_handler)(struct sk_buff *,

						 struct batadv_hard_iface *));

void batadv_recv_handler_unregister(u8 packet_type);

__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr);



/**

 * batadv_compare_eth() - Compare two not u16 aligned Ethernet addresses