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

Commit cc328dea 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:
- set the protocol field in the skb structure according to the encapsulated
  payload
- make the gateway component send a uevent in case of "gw client mode"
  de-selection
- increment version number
- minor code rearrangement

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 80b17be7 c6eaa3f0

net/batman-adv/bat_iv_ogm.c

+17 −15
Original line number Diff line number Diff line
@@ -28,6 +28,22 @@ 
#include "bat_algo.h"

#include "network-coding.h"





/**

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

 * @BATADV_NEIGH_DUP: OGM is a duplicate for the neighbor

 * @BATADV_PROTECTED: originator is currently protected (after reboot)

 */

enum batadv_dup_status {

	BATADV_NO_DUP = 0,

	BATADV_ORIG_DUP,

	BATADV_NEIGH_DUP,

	BATADV_PROTECTED,

};



/**

 * batadv_ring_buffer_set - update the ring buffer with the given value

 * @lq_recv: pointer to the ring buffer
@@ -71,21 +87,6 @@ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[]) 
	return (uint8_t)(sum / count);

}



/*

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

 * @BATADV_NEIGH_DUP: OGM is a duplicate for the neighbor

 * @BATADV_PROTECTED: originator is currently protected (after reboot)

 */

enum batadv_dup_status {

	BATADV_NO_DUP = 0,

	BATADV_ORIG_DUP,

	BATADV_NEIGH_DUP,

	BATADV_PROTECTED,

};



static struct batadv_neigh_node *

batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,

			const uint8_t *neigh_addr,
@@ -478,6 +479,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, 
		kfree(forw_packet_aggr);

		goto out;

	}

	forw_packet_aggr->skb->priority = TC_PRIO_CONTROL;

	skb_reserve(forw_packet_aggr->skb, ETH_HLEN);



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

net/batman-adv/gateway_client.c

+27 −0
Original line number Diff line number Diff line
@@ -190,6 +190,33 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) 
	return curr_gw;

}



/**

 * batadv_gw_check_client_stop - check if client mode has been switched off

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

 *

 * This function assumes the caller has checked that the gw state *is actually

 * changing*. This function is not supposed to be called when there is no state

 * change.

 */

void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)

{

	struct batadv_gw_node *curr_gw;



	if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_CLIENT)

		return;



	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);

	if (!curr_gw)

		return;



	/* if batman-adv is switching the gw client mode off and a gateway was

	 * already selected, send a DEL uevent

	 */

	batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_DEL, NULL);



	batadv_gw_node_free_ref(curr_gw);

}



void batadv_gw_election(struct batadv_priv *bat_priv)

{

	struct batadv_gw_node *curr_gw = NULL, *next_gw = NULL;

net/batman-adv/gateway_client.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_

#define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_



void batadv_gw_check_client_stop(struct batadv_priv *bat_priv);

void batadv_gw_deselect(struct batadv_priv *bat_priv);

void batadv_gw_election(struct batadv_priv *bat_priv);

struct batadv_orig_node *

net/batman-adv/icmp_socket.c

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, 
		goto out;

	}



	skb->priority = TC_PRIO_CONTROL;

	skb_reserve(skb, ETH_HLEN);

	icmp_packet = (struct batadv_icmp_packet_rr *)skb_put(skb, packet_len);

net/batman-adv/main.c

+58 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 


#include <linux/crc32c.h>

#include <linux/highmem.h>

#include <linux/if_vlan.h>

#include <net/ip.h>

#include <net/ipv6.h>

#include <net/dsfield.h>

#include "main.h"

#include "sysfs.h"

#include "debugfs.h"
@@ -249,6 +253,60 @@ batadv_seq_print_text_primary_if_get(struct seq_file *seq) 
	return primary_if;

}



/**

 * batadv_skb_set_priority - sets skb priority according to packet content

 * @skb: the packet to be sent

 * @offset: offset to the packet content

 *

 * This function sets a value between 256 and 263 (802.1d priority), which

 * can be interpreted by the cfg80211 or other drivers.

 */

void batadv_skb_set_priority(struct sk_buff *skb, int offset)

{

	struct iphdr ip_hdr_tmp, *ip_hdr;

	struct ipv6hdr ip6_hdr_tmp, *ip6_hdr;

	struct ethhdr ethhdr_tmp, *ethhdr;

	struct vlan_ethhdr *vhdr, vhdr_tmp;

	u32 prio;



	/* already set, do nothing */

	if (skb->priority >= 256 && skb->priority <= 263)

		return;



	ethhdr = skb_header_pointer(skb, offset, sizeof(*ethhdr), &ethhdr_tmp);

	if (!ethhdr)

		return;



	switch (ethhdr->h_proto) {

	case htons(ETH_P_8021Q):

		vhdr = skb_header_pointer(skb, offset + sizeof(*vhdr),

					  sizeof(*vhdr), &vhdr_tmp);

		if (!vhdr)

			return;

		prio = ntohs(vhdr->h_vlan_TCI) & VLAN_PRIO_MASK;

		prio = prio >> VLAN_PRIO_SHIFT;

		break;

	case htons(ETH_P_IP):

		ip_hdr = skb_header_pointer(skb, offset + sizeof(*ethhdr),

					    sizeof(*ip_hdr), &ip_hdr_tmp);

		if (!ip_hdr)

			return;

		prio = (ipv4_get_dsfield(ip_hdr) & 0xfc) >> 5;

		break;

	case htons(ETH_P_IPV6):

		ip6_hdr = skb_header_pointer(skb, offset + sizeof(*ethhdr),

					     sizeof(*ip6_hdr), &ip6_hdr_tmp);

		if (!ip6_hdr)

			return;

		prio = (ipv6_get_dsfield(ip6_hdr) & 0xfc) >> 5;

		break;

	default:

		return;

	}



	skb->priority = prio + 256;

}



static int batadv_recv_unhandled_packet(struct sk_buff *skb,

					struct batadv_hard_iface *recv_if)

{