dpdk/dpdk-16.04_patches/0008-Add-missing-init-of-packet_type-field.patch

   1 From dfb597dfb4c8e36edb4f1db0162a12f9e0d9e695 Mon Sep 17 00:00:00 2001
   2 From: Bud Grise <griseb@cisco.com>
   3 Date: Mon, 1 Feb 2016 14:28:01 -0500
   4 Subject: [PATCH 8/8] Add missing init of packet_type field.
   5
   6 This can cause packets to be mishandled in systems with more than
   7 one type of driver in use.
   8
   9 Signed-off-by: Todd Foggoa (tfoggoa) <tfoggoa@cisco.com>
  10 ---
  11  drivers/net/e1000/em_rxtx.c        | 2 ++
  12  drivers/net/virtio/virtio_rxtx.c   | 2 ++
  13  drivers/net/vmxnet3/vmxnet3_rxtx.c | 1 +
  14  3 files changed, 5 insertions(+)
  15
  16 diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
  17 index 441ccad..3bac431 100644
  18 --- a/drivers/net/e1000/em_rxtx.c
  19 +++ b/drivers/net/e1000/em_rxtx.c
  20 @@ -793,6 +793,7 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
  21                 rxm->ol_flags = rx_desc_status_to_pkt_flags(status);
  22                 rxm->ol_flags = rxm->ol_flags |
  23                                 rx_desc_error_to_pkt_flags(rxd.errors);
  24 +               rxm->packet_type = RTE_PTYPE_UNKNOWN;
  25
  26                 /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
  27                 rxm->vlan_tci = rte_le_to_cpu_16(rxd.special);
  28 @@ -1019,6 +1020,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
  29                 first_seg->ol_flags = rx_desc_status_to_pkt_flags(status);
  30                 first_seg->ol_flags = first_seg->ol_flags |
  31                                         rx_desc_error_to_pkt_flags(rxd.errors);
  32 +               first_seg->packet_type = RTE_PTYPE_UNKNOWN;
  33
  34                 /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */
  35                 rxm->vlan_tci = rte_le_to_cpu_16(rxd.special);
  36 diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
  37 index 7fe14ad..4959d8f 100644
  38 --- a/drivers/net/virtio/virtio_rxtx.c
  39 +++ b/drivers/net/virtio/virtio_rxtx.c
  40 @@ -644,6 +644,7 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
  41                 rxm->pkt_len = (uint32_t)(len[i] - hdr_size);
  42                 rxm->data_len = (uint16_t)(len[i] - hdr_size);
  43                 rxm->ol_flags = 0;
  44 +               rxm->packet_type = RTE_PTYPE_UNKNOWN;
  45
  46                 if (hw->vlan_strip)
  47                         rte_vlan_strip(rxm);
  48 @@ -762,6 +763,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,
  49                 rxm->pkt_len = (uint32_t)(len[0] - hdr_size);
  50                 rxm->data_len = (uint16_t)(len[0] - hdr_size);
  51                 rxm->ol_flags = 0;
  52 +               rxm->packet_type = RTE_PTYPE_UNKNOWN;
  53
  54                 rxm->port = rxvq->port_id;
  55                 rx_pkts[nb_rx] = rxm;
  56 diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
  57 index 4ac0456..d26d2a0 100644
  58 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
  59 +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
  60 @@ -701,6 +701,7 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
  61                 rxm->data_off = RTE_PKTMBUF_HEADROOM;
  62                 rxm->ol_flags = 0;
  63                 rxm->vlan_tci = 0;
  64 +               rxm->packet_type = RTE_PTYPE_UNKNOWN;
  65
  66                 /*
  67                  * If this is the first buffer of the received packet,
  68 --
  69 2.5.4 (Apple Git-61)
  70