From 99f2a299456273a0c249b7a6eebfbd532b49d558 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Tue, 12 Feb 2019 14:20:58 -0800 Subject: [PATCH] qcacmn: Replace ETHERTYPE_8021Q with ETHERTYPE_VLAN Replace ETHERTYPE_8021Q with ETHERTYPE_VLAN. CRs-Fixed: 2404839 Change-Id: I5a1f721246ae71848f259a19ee3aa0de005ea43b --- dp/wifi3.0/dp_tx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 17ca749e0b65..4ca579e81b42 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -30,6 +30,7 @@ #ifdef MESH_MODE_SUPPORT #include "if_meta_hdr.h" #endif +#include "enet.h" #define DP_TX_QUEUE_MASK 0x3 @@ -1119,13 +1120,13 @@ static bool dp_cce_classify(struct dp_vdev *vdev, qdf_nbuf_t nbuf) if (qdf_unlikely(nbuf_clone)) { qdf_nbuf_pull_head(nbuf_clone, sizeof(*llcHdr)); - if (ether_type == htons(ETHERTYPE_8021Q)) { + if (ether_type == htons(ETHERTYPE_VLAN)) { qdf_nbuf_pull_head(nbuf_clone, sizeof(qdf_net_vlanhdr_t)); } } } else { - if (ether_type == htons(ETHERTYPE_8021Q)) { + if (ether_type == htons(ETHERTYPE_VLAN)) { nbuf_clone = qdf_nbuf_clone(nbuf); if (qdf_unlikely(nbuf_clone)) { qdf_nbuf_pull_head(nbuf_clone, @@ -1213,7 +1214,7 @@ static void dp_tx_classify_tid(struct dp_vdev *vdev, qdf_nbuf_t nbuf, ether_type = (uint16_t)*(nbuf->data + 2*ETHER_ADDR_LEN + sizeof(*llcHdr)); - if (ether_type == htons(ETHERTYPE_8021Q)) { + if (ether_type == htons(ETHERTYPE_VLAN)) { L3datap = hdr_ptr + sizeof(qdf_ethervlan_header_t) + sizeof(*llcHdr); ether_type = (uint16_t)*(nbuf->data + 2*ETHER_ADDR_LEN @@ -1224,7 +1225,7 @@ static void dp_tx_classify_tid(struct dp_vdev *vdev, qdf_nbuf_t nbuf, sizeof(*llcHdr); } } else { - if (ether_type == htons(ETHERTYPE_8021Q)) { + if (ether_type == htons(ETHERTYPE_VLAN)) { evh = (qdf_ethervlan_header_t *) eh; ether_type = evh->ether_type; L3datap = hdr_ptr + sizeof(qdf_ethervlan_header_t);