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: Simon Wunderlich <simon@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

1 files changed, 19 insertions, 1 deletions

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 2f0bd3ffe6e8..0439395d7ba5 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -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);