Commit 860b4042 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:
- use ether_addr_copy instead of memcpy when possible
- implement new multicast packet optimisation
- improve several kerneldoc sections
- minor code cleanups

here you have our patchset for net-next/linux-3.15.  They are 16
patches but most of them are just small cleanups and kerneldoc
improvements.

The only big change is the one from patch 8 to 13 by Linus Lüssing
that introduces a new multicast packets optimisation. This new
component aims to reduce the air overhead by sending multicast packets
as bat-unicast when only one destination exists or by dropping them
directly at the source if the multicast group is totally empty.

In patch 11 Linus introduces an atomic_t variable, that like others
that we already have is only object of write and read, thus making the
atomic characteristic totally useless.  Unfortunately this is part of
our sysfs framework, that helps the developer to introduce new knobs
by using few macros only. For this reason we decided to keep Linus'
new knob for now, but I'd like to let you know that we are in the
process of re-working such framework in order to convert all the
current (useless) atomic_t to boolean in one go.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 65025079 3f2532fc

Documentation/ABI/testing/sysfs-class-net-mesh

+9 −0
Original line number Diff line number Diff line
@@ -76,6 +76,15 @@ Description: 
		is used to classify clients as "isolated" by the

		Extended Isolation feature.



What:           /sys/class/net/<mesh_iface>/mesh/multicast_mode

Date:           Feb 2014

Contact:        Linus Lüssing <linus.luessing@web.de>

Description:

                Indicates whether multicast optimizations are enabled

                or disabled. If set to zero then all nodes in the

                mesh are going to use classic flooding for any

                multicast packet with no optimizations.



What:           /sys/class/net/<mesh_iface>/mesh/network_coding

Date:           Nov 2012

Contact:        Martin Hundeboll <martin@hundeboll.net>

net/batman-adv/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -50,6 +50,15 @@ config BATMAN_ADV_NC 
	  If you think that your network does not need this feature you

	  can safely disable it and save some space.



config BATMAN_ADV_MCAST

	bool "Multicast optimisation"

	depends on BATMAN_ADV

	default n

	help

	  This option enables the multicast optimisation which aims to

	  reduce the air overhead while improving the reliability of

	  multicast messages.



config BATMAN_ADV_DEBUG

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

	depends on BATMAN_ADV

net/batman-adv/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,3 +36,4 @@ batman-adv-y += send.o 
batman-adv-y += soft-interface.o

batman-adv-y += sysfs.o

batman-adv-y += translation-table.o

batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o

net/batman-adv/bat_iv_ogm.c

+5 −5
Original line number Diff line number Diff line
@@ -347,10 +347,10 @@ static void batadv_iv_ogm_iface_update_mac(struct batadv_hard_iface *hard_iface) 
	unsigned char *ogm_buff = hard_iface->bat_iv.ogm_buff;



	batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff;

	memcpy(batadv_ogm_packet->orig,

	       hard_iface->net_dev->dev_addr, ETH_ALEN);

	memcpy(batadv_ogm_packet->prev_sender,

	       hard_iface->net_dev->dev_addr, ETH_ALEN);

	ether_addr_copy(batadv_ogm_packet->orig,

			hard_iface->net_dev->dev_addr);

	ether_addr_copy(batadv_ogm_packet->prev_sender,

			hard_iface->net_dev->dev_addr);

}



static void
@@ -830,7 +830,7 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, 
	tvlv_len = ntohs(batadv_ogm_packet->tvlv_len);



	batadv_ogm_packet->ttl--;

	memcpy(batadv_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN);

	ether_addr_copy(batadv_ogm_packet->prev_sender, ethhdr->h_source);



	/* apply hop penalty */

	batadv_ogm_packet->tq = batadv_hop_penalty(batadv_ogm_packet->tq,

net/batman-adv/bridge_loop_avoidance.c

+16 −19
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ batadv_backbone_hash_find(struct batadv_priv *bat_priv, 
	if (!hash)

		return NULL;



	memcpy(search_entry.orig, addr, ETH_ALEN);

	ether_addr_copy(search_entry.orig, addr);

	search_entry.vid = vid;



	index = batadv_choose_backbone_gw(&search_entry, hash->size);
@@ -305,7 +305,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		/* normal claim frame

		 * set Ethernet SRC to the clients mac

		 */

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

		ether_addr_copy(ethhdr->h_source, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

			   BATADV_PRINT_VID(vid));
@@ -314,7 +314,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		/* unclaim frame

		 * set HW SRC to the clients mac

		 */

		memcpy(hw_src, mac, ETH_ALEN);

		ether_addr_copy(hw_src, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

			   BATADV_PRINT_VID(vid));
@@ -323,7 +323,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		/* announcement frame

		 * set HW SRC to the special mac containg the crc

		 */

		memcpy(hw_src, mac, ETH_ALEN);

		ether_addr_copy(hw_src, mac);

		batadv_dbg(BATADV_DBG_BLA, bat_priv,

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

			   ethhdr->h_source, BATADV_PRINT_VID(vid));
@@ -333,8 +333,8 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, 
		 * set HW SRC and header destination to the receiving backbone

		 * gws mac

		 */

		memcpy(hw_src, mac, ETH_ALEN);

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

		ether_addr_copy(hw_src, mac);

		ether_addr_copy(ethhdr->h_dest, mac);

		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,
@@ -395,7 +395,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, uint8_t *orig, 
	entry->bat_priv = bat_priv;

	atomic_set(&entry->request_sent, 0);

	atomic_set(&entry->wait_periods, 0);

	memcpy(entry->orig, orig, ETH_ALEN);

	ether_addr_copy(entry->orig, orig);



	/* one for the hash, one for returning */

	atomic_set(&entry->refcount, 2);
@@ -563,7 +563,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
	struct batadv_bla_claim search_claim;

	int hash_added;



	memcpy(search_claim.addr, mac, ETH_ALEN);

	ether_addr_copy(search_claim.addr, mac);

	search_claim.vid = vid;

	claim = batadv_claim_hash_find(bat_priv, &search_claim);
@@ -573,7 +573,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv, 
		if (!claim)

			return;



		memcpy(claim->addr, mac, ETH_ALEN);

		ether_addr_copy(claim->addr, mac);

		claim->vid = vid;

		claim->lasttime = jiffies;

		claim->backbone_gw = backbone_gw;
@@ -624,7 +624,7 @@ static void batadv_bla_del_claim(struct batadv_priv *bat_priv, 
{

	struct batadv_bla_claim search_claim, *claim;



	memcpy(search_claim.addr, mac, ETH_ALEN);

	ether_addr_copy(search_claim.addr, mac);

	search_claim.vid = vid;

	claim = batadv_claim_hash_find(bat_priv, &search_claim);

	if (!claim)
@@ -882,7 +882,7 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, 
	proto = ethhdr->h_proto;

	headlen = ETH_HLEN;

	if (vid & BATADV_VLAN_HAS_TAG) {

		vhdr = (struct vlan_ethhdr *)ethhdr;

		vhdr = vlan_eth_hdr(skb);

		proto = vhdr->h_vlan_encapsulated_proto;

		headlen += VLAN_HLEN;

	}
@@ -1103,8 +1103,8 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, 
						oldif->net_dev->dev_addr))

				continue;



			memcpy(backbone_gw->orig,

			       primary_if->net_dev->dev_addr, ETH_ALEN);

			ether_addr_copy(backbone_gw->orig,

					primary_if->net_dev->dev_addr);

			/* send an announce frame so others will ask for our

			 * claims and update their tables.

			 */
@@ -1310,7 +1310,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, 
	entry = &bat_priv->bla.bcast_duplist[curr];

	entry->crc = crc;

	entry->entrytime = jiffies;

	memcpy(entry->orig, bcast_packet->orig, ETH_ALEN);

	ether_addr_copy(entry->orig, bcast_packet->orig);

	bat_priv->bla.bcast_duplist_curr = curr;



out:
@@ -1458,7 +1458,7 @@ int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
		if (is_multicast_ether_addr(ethhdr->h_dest) && is_bcast)

			goto handled;



	memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN);

	ether_addr_copy(search_claim.addr, ethhdr->h_source);

	search_claim.vid = vid;

	claim = batadv_claim_hash_find(bat_priv, &search_claim);
@@ -1547,9 +1547,6 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
	if (!atomic_read(&bat_priv->bridge_loop_avoidance))

		goto allow;



	/* in VLAN case, the mac header might not be set. */

	skb_reset_mac_header(skb);



	if (batadv_bla_process_claim(bat_priv, primary_if, skb))

		goto handled;
@@ -1560,7 +1557,7 @@ int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, 
		if (is_multicast_ether_addr(ethhdr->h_dest))

			goto handled;



	memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN);

	ether_addr_copy(search_claim.addr, ethhdr->h_source);

	search_claim.vid = vid;



	claim = batadv_claim_hash_find(bat_priv, &search_claim);

CRA Git | Maintained and supported by SUSTech CRA and CCSE