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

Commit c54f38c9 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Antonio Quartulli
Browse files

batman-adv: set skb priority according to content 



The skb priority field may help the wireless driver to choose the right
queue (e.g. WMM queues). This should be set in batman-adv, as this
information is only available here.

This patch adds support for IPv4/IPv6 DS fields and VLAN PCP. Note that
only VLAN PCP is used if a VLAN header is present. Also initially set
TC_PRIO_CONTROL only for self-generated packets, and keep the priority
set by higher layers.

Signed-off-by: default avatarSimon Wunderlich <simon@open-mesh.com>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent 5b2941b1

net/batman-adv/bat_iv_ogm.c

+1 −0
Original line number Diff line number Diff line
@@ -478,6 +478,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/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)

{

net/batman-adv/main.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ void batadv_mesh_free(struct net_device *soft_iface); 
int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr);

struct batadv_hard_iface *

batadv_seq_print_text_primary_if_get(struct seq_file *seq);

void batadv_skb_set_priority(struct sk_buff *skb, int offset);

int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,

			   struct packet_type *ptype,

			   struct net_device *orig_dev);

net/batman-adv/routing.c

+19 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, 
	struct batadv_neigh_node *neigh_node = NULL;

	struct batadv_unicast_packet *unicast_packet;

	struct ethhdr *ethhdr = eth_hdr(skb);

	int res, ret = NET_RX_DROP;

	int res, hdr_len, ret = NET_RX_DROP;

	struct sk_buff *new_skb;



	unicast_packet = (struct batadv_unicast_packet *)skb->data;
@@ -835,6 +835,22 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, 
	/* decrement ttl */

	unicast_packet->header.ttl--;



	switch (unicast_packet->header.packet_type) {

	case BATADV_UNICAST_4ADDR:

		hdr_len = sizeof(struct batadv_unicast_4addr_packet);

		break;

	case BATADV_UNICAST:

		hdr_len = sizeof(struct batadv_unicast_packet);

		break;

	default:

		/* other packet types not supported - yet */

		hdr_len = -1;

		break;

	}



	if (hdr_len > 0)

		batadv_skb_set_priority(skb, hdr_len);



	res = batadv_send_skb_to_orig(skb, orig_node, recv_if);



	/* translate transmit result into receive result */
@@ -1193,6 +1209,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, 
	if (batadv_bla_check_bcast_duplist(bat_priv, skb))

		goto out;



	batadv_skb_set_priority(skb, sizeof(struct batadv_bcast_packet));



	/* rebroadcast packet */

	batadv_add_bcast_packet_to_list(bat_priv, skb, 1);