From 0517bfc356e49db1d3ebaa6d073d2e71a5f9f227 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 15 Jun 2017 15:13:34 -0700 Subject: [PATCH] qcacld-3.0: Fix clang warnings enum 'qdf_nbuf_l4_rx_cksum_result_t' warning: implicit conversion from enumeration type 'qdf_nbuf_l4_rx_cksum_result_t' to different enumeration type 'qdf_nbuf_l4_rx_cksum_type_t Change-Id: If2b7ee179fa260c14cde450cc72272c41a9f4adb CRs-Fixed: 2055487 --- core/dp/htt/htt_rx.c | 12 ++++++------ core/dp/ol/inc/ol_htt_tx_api.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 029666559da6..31aa5fd0f389 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -998,20 +998,20 @@ htt_set_checksum_result_ll(htt_pdev_handle pdev, qdf_nbuf_t msdu, { /* non-fragmented IP packet */ /* non TCP/UDP packet */ - {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_ZERO, QDF_NBUF_RX_CKSUM_ZERO}, /* TCP packet */ {QDF_NBUF_RX_CKSUM_TCP, QDF_NBUF_RX_CKSUM_TCPIPV6}, /* UDP packet */ {QDF_NBUF_RX_CKSUM_UDP, QDF_NBUF_RX_CKSUM_UDPIPV6}, /* invalid packet type */ - {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_ZERO, QDF_NBUF_RX_CKSUM_ZERO}, }, { /* fragmented IP packet */ - {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, - {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, - {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, - {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_ZERO, QDF_NBUF_RX_CKSUM_ZERO}, + {QDF_NBUF_RX_CKSUM_ZERO, QDF_NBUF_RX_CKSUM_ZERO}, + {QDF_NBUF_RX_CKSUM_ZERO, QDF_NBUF_RX_CKSUM_ZERO}, + {QDF_NBUF_RX_CKSUM_ZERO, QDF_NBUF_RX_CKSUM_ZERO}, } }; diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index 577c6dba22f3..ebc8578c6bcb 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -742,7 +742,7 @@ void htt_tx_desc_frags_table_set(htt_pdev_handle pdev, static inline void htt_tx_desc_type(htt_pdev_handle pdev, - void *htt_tx_desc, enum wlan_frm_fmt type, uint8_t sub_type) + void *htt_tx_desc, enum htt_pkt_type type, uint8_t sub_type) { uint32_t *word0;