The following commit has been merged in the merge/master branch: commit 4ffe28ffec5b1393e819256e30925144c1105c5e Merge: 40a5633f83ee6a4861889828aac29605e6f984ed ad81f0545ef01ea651886dddac4bef6cec930092 Author: Antonio Quartulli ordex@autistici.org Date: Mon Aug 19 19:10:12 2013 +0200

Merge tag 'v3.11-rc1' into merge/master

Linux 3.11-rc1

Signed-off-by: Antonio Quartulli ordex@autistici.org

Conflicts: net/batman-adv/bat_iv_ogm.c net/batman-adv/icmp_socket.c net/batman-adv/main.h net/batman-adv/routing.c net/batman-adv/translation-table.c net/batman-adv/vis.c

diff --combined net/batman-adv/main.c index 58c98b6,08125f3..c72d1bc --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@@ -19,10 -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" @@@ -253,60 -249,6 +253,60 @@@ out 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) { @@@ -531,7 -473,6 +531,6 @@@ __be32 batadv_skb_crc32(struct sk_buff crc = crc32c(crc, data, len); consumed += len; } - skb_abort_seq_read(&st);

return htonl(crc); }