Merge "Do not add 1 to the queue in the common code"

Juniper · Sep 6, 2016 · 21ff1a6 · 21ff1a6
2 parents 958abf1 + c301e8d
commit 21ff1a6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/dp-core/vr_nexthop.c b/dp-core/vr_nexthop.c
@@ -401,7 +401,7 @@ nh_udp_tunnel_helper(struct vr_packet *pkt, unsigned short sport,
     ip->ip_hl = 5;
     if (qos) {
         ip->ip_tos = VR_IP_DSCP(qos->vfcq_dscp);
-        pkt->vp_queue = qos->vfcq_queue_id + 1;
+        pkt->vp_queue = qos->vfcq_queue_id;
         pkt->vp_priority = qos->vfcq_dotonep_qos;
     } else {
         ip->ip_tos = 0;
@@ -1902,7 +1902,7 @@ nh_gre_tunnel(struct vr_packet *pkt, struct vr_nexthop *nh,
     ip->ip_hl = 5;
     if (qos) {
         ip->ip_tos = VR_IP_DSCP(qos->vfcq_dscp);
-        pkt->vp_queue = qos->vfcq_queue_id + 1;
+        pkt->vp_queue = qos->vfcq_queue_id;
         pkt->vp_priority = qos->vfcq_dotonep_qos;
     } else {
         ip->ip_tos = 0;
@@ -2036,7 +2036,7 @@ nh_encap_l2(struct vr_packet *pkt, struct vr_nexthop *nh,
                 vr_inet6_set_tos((struct vr_ip6 *)pkt_network_header(pkt),
                         qos->vfcq_dscp);
             }
-            pkt->vp_queue = qos->vfcq_queue_id + 1;
+            pkt->vp_queue = qos->vfcq_queue_id;
             pkt->vp_priority = qos->vfcq_dotonep_qos;
         }
     }

diff --git a/dp-core/vr_proto_ip.c b/dp-core/vr_proto_ip.c
@@ -587,7 +587,7 @@ vr_ip_rcv(struct vrouter *router, struct vr_packet *pkt,
 
         if (qos) {
             vr_inet_set_tos(ip, VR_IP_DSCP(qos->vfcq_dscp));
-            pkt->vp_queue = qos->vfcq_queue_id + 1;
+            pkt->vp_queue = qos->vfcq_queue_id;
             pkt->vp_priority = qos->vfcq_dotonep_qos;
         }
 

diff --git a/linux/vr_host_interface.c b/linux/vr_host_interface.c
@@ -793,8 +793,9 @@ linux_if_tx(struct vr_interface *vif, struct vr_packet *pkt)
     }
 
     skb_reset_mac_header(skb);
+    /* linux subtracts 1 from the queue value */
     if (pkt->vp_queue != VP_QUEUE_INVALID)
-        skb->queue_mapping = pkt->vp_queue;
+        skb->queue_mapping = pkt->vp_queue + 1;
 
     if (pkt->vp_priority != VP_PRIORITY_INVALID)
         skb->priority = pkt->vp_priority;