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

Commit 5712dc7f authored by Tobias Klauser's avatar Tobias Klauser Committed by Greg Kroah-Hartman
Browse files

staging: batman-adv: Use linux/etherdevice.h address helper functions 



Replace custom ethernet address check functions by calls to the helpers
in linux/etherdevice.h

In one case where the address was tested for broadcast and multicast
address, the broadcast address check can be omitted as broadcast is also
a multicast address.

The patch is only compile-tested.

Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e09f138e

drivers/staging/batman-adv/main.c

+1 −11
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ void dec_module_count(void) 




int compare_orig(void *data1, void *data2)

int compare_orig(void *data1, void *data2)

{

{

	return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);

	return (compare_ether_addr(data1, data2) == 0 ? 1 : 0);

}

}





/* hashfunction to choose an entry in a hash table of given size */

/* hashfunction to choose an entry in a hash table of given size */
@@ -192,16 +192,6 @@ int is_my_mac(uint8_t *addr) 




}

}





int is_bcast(uint8_t *addr)

{

	return (addr[0] == (uint8_t)0xff) && (addr[1] == (uint8_t)0xff);

}



int is_mcast(uint8_t *addr)

{

	return *addr & 0x01;

}



module_init(batman_init);

module_init(batman_init);

module_exit(batman_exit);

module_exit(batman_exit);

drivers/staging/batman-adv/main.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -109,6 +109,7 @@ 
#include <linux/mutex.h>	/* mutex */

#include <linux/mutex.h>	/* mutex */

#include <linux/module.h>	/* needed by all modules */

#include <linux/module.h>	/* needed by all modules */

#include <linux/netdevice.h>	/* netdevice */

#include <linux/netdevice.h>	/* netdevice */

#include <linux/etherdevice.h>

#include <linux/if_ether.h>	/* ethernet header */

#include <linux/if_ether.h>	/* ethernet header */

#include <linux/poll.h>		/* poll_table */

#include <linux/poll.h>		/* poll_table */

#include <linux/kthread.h>	/* kernel threads */

#include <linux/kthread.h>	/* kernel threads */
@@ -138,8 +139,6 @@ void dec_module_count(void); 
int compare_orig(void *data1, void *data2);

int compare_orig(void *data1, void *data2);

int choose_orig(void *data, int32_t size);

int choose_orig(void *data, int32_t size);

int is_my_mac(uint8_t *addr);

int is_my_mac(uint8_t *addr);

int is_bcast(uint8_t *addr);

int is_mcast(uint8_t *addr);





#ifdef CONFIG_BATMAN_ADV_DEBUG

#ifdef CONFIG_BATMAN_ADV_DEBUG

int debug_log(struct bat_priv *bat_priv, char *fmt, ...);

int debug_log(struct bat_priv *bat_priv, char *fmt, ...);

drivers/staging/batman-adv/routing.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -756,11 +756,11 @@ int recv_bat_packet(struct sk_buff *skb, struct batman_if *batman_if) 
	ethhdr = (struct ethhdr *)skb_mac_header(skb);

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





	/* packet with broadcast indication but unicast recipient */

	/* packet with broadcast indication but unicast recipient */

	if (!is_bcast(ethhdr->h_dest))

	if (!is_broadcast_ether_addr(ethhdr->h_dest))

		return NET_RX_DROP;

		return NET_RX_DROP;





	/* packet with broadcast sender address */

	/* packet with broadcast sender address */

	if (is_bcast(ethhdr->h_source))

	if (is_broadcast_ether_addr(ethhdr->h_source))

		return NET_RX_DROP;

		return NET_RX_DROP;





	/* create a copy of the skb, if needed, to modify it. */

	/* create a copy of the skb, if needed, to modify it. */
@@ -933,11 +933,11 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if) 
	ethhdr = (struct ethhdr *)skb_mac_header(skb);

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





	/* packet with unicast indication but broadcast recipient */

	/* packet with unicast indication but broadcast recipient */

	if (is_bcast(ethhdr->h_dest))

	if (is_broadcast_ether_addr(ethhdr->h_dest))

		return NET_RX_DROP;

		return NET_RX_DROP;





	/* packet with broadcast sender address */

	/* packet with broadcast sender address */

	if (is_bcast(ethhdr->h_source))

	if (is_broadcast_ether_addr(ethhdr->h_source))

		return NET_RX_DROP;

		return NET_RX_DROP;





	/* not for me */

	/* not for me */
@@ -1107,11 +1107,11 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size) 
	ethhdr = (struct ethhdr *)skb_mac_header(skb);

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





	/* packet with unicast indication but broadcast recipient */

	/* packet with unicast indication but broadcast recipient */

	if (is_bcast(ethhdr->h_dest))

	if (is_broadcast_ether_addr(ethhdr->h_dest))

		return -1;

		return -1;





	/* packet with broadcast sender address */

	/* packet with broadcast sender address */

	if (is_bcast(ethhdr->h_source))

	if (is_broadcast_ether_addr(ethhdr->h_source))

		return -1;

		return -1;





	/* not for me */

	/* not for me */
@@ -1283,11 +1283,11 @@ int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if) 
	ethhdr = (struct ethhdr *)skb_mac_header(skb);

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





	/* packet with broadcast indication but unicast recipient */

	/* packet with broadcast indication but unicast recipient */

	if (!is_bcast(ethhdr->h_dest))

	if (!is_broadcast_ether_addr(ethhdr->h_dest))

		return NET_RX_DROP;

		return NET_RX_DROP;





	/* packet with broadcast sender address */

	/* packet with broadcast sender address */

	if (is_bcast(ethhdr->h_source))

	if (is_broadcast_ether_addr(ethhdr->h_source))

		return NET_RX_DROP;

		return NET_RX_DROP;





	/* ignore broadcasts sent by myself */

	/* ignore broadcasts sent by myself */

drivers/staging/batman-adv/soft-interface.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) 
	hna_local_add(soft_iface, ethhdr->h_source);

	hna_local_add(soft_iface, ethhdr->h_source);





	/* ethernet packet should be broadcasted */

	/* ethernet packet should be broadcasted */

	if (is_bcast(ethhdr->h_dest) || is_mcast(ethhdr->h_dest)) {

	if (is_multicast_ether_addr(ethhdr->h_dest)) {

		if (!bat_priv->primary_if)

		if (!bat_priv->primary_if)

			goto dropped;

			goto dropped;

drivers/staging/batman-adv/vis.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -469,7 +469,7 @@ void receive_client_update_packet(struct bat_priv *bat_priv, 
	int are_target = 0;

	int are_target = 0;





	/* clients shall not broadcast. */

	/* clients shall not broadcast. */

	if (is_bcast(vis_packet->target_orig))

	if (is_broadcast_ether_addr(vis_packet->target_orig))

		return;

		return;





	/* Are we the target for this VIS packet? */

	/* Are we the target for this VIS packet? */
@@ -746,7 +746,7 @@ static void send_vis_packet(struct bat_priv *bat_priv, struct vis_info *info) 
	       ETH_ALEN);

	       ETH_ALEN);

	packet->ttl--;

	packet->ttl--;





	if (is_bcast(packet->target_orig))

	if (is_broadcast_ether_addr(packet->target_orig))

		broadcast_vis_packet(bat_priv, info);

		broadcast_vis_packet(bat_priv, info);

	else

	else

		unicast_vis_packet(bat_priv, info);

		unicast_vis_packet(bat_priv, info);