summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimanshu Agarwal <himanaga@codeaurora.org>2016-09-02 16:52:02 +0530
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-09-06 13:06:26 +0530
commit86b19f67608d10697f511ea544f864ded1668d8d (patch)
tree86bdfa2b1ed573e9f0000773a08aacd3e2c11843
parentf353aabd90538617298ebff9a4e49c8aaaa8e1c3 (diff)
qcacld-2.0: Fix flooding of DPTRACE logs for DHCP/EAPOL pkts
For DHCP and EAPOL packets, the APIs to find whether it is a DHCP or EAPOL packet returns A_STATUS_OK and A_STATUS_FAILED instead of boolean true and false. This leads to wrong identifiaction of packets in rx path as DHCP and EAPOL packets and so each rx packet is either identified as DHCP or EAPOL packet and hence flooding of logs in kmsg. Fix the return type of APIs to return boolean true and false. Change-Id: Ic8ca56690a17ef1b1196a243d75d2edf5f735a09 CRs-Fixed: 1062897
-rw-r--r--CORE/CLD_TXRX/TXRX/ol_tx_classify.c4
-rw-r--r--CORE/SERVICES/COMMON/adf/adf_nbuf.c22
-rw-r--r--CORE/SERVICES/COMMON/adf/adf_nbuf.h32
-rw-r--r--CORE/SERVICES/COMMON/adf/adf_trace.c6
-rw-r--r--CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h4
-rw-r--r--CORE/SERVICES/WMA/wma.c3
-rw-r--r--CORE/VOSS/src/vos_packet.c4
7 files changed, 36 insertions, 39 deletions
diff --git a/CORE/CLD_TXRX/TXRX/ol_tx_classify.c b/CORE/CLD_TXRX/TXRX/ol_tx_classify.c
index a67082d290df..44a5904eafd5 100644
--- a/CORE/CLD_TXRX/TXRX/ol_tx_classify.c
+++ b/CORE/CLD_TXRX/TXRX/ol_tx_classify.c
@@ -376,7 +376,7 @@ ol_tx_classify(
return NULL; /* error */
} else if ((peer->security[OL_TXRX_PEER_SECURITY_MULTICAST].sec_type
!= htt_sec_type_wapi) &&
- (A_STATUS_OK == adf_nbuf_is_dhcp_pkt(tx_nbuf))) {
+ adf_nbuf_is_dhcp_pkt(tx_nbuf)) {
/* DHCP frame to go with voice priority */
txq = &peer->txqs[TX_DHCP_TID];
tx_msdu_info->htt.info.ext_tid = TX_DHCP_TID;
@@ -503,7 +503,7 @@ ol_tx_classify(
tid = OL_TX_NON_QOS_TID;
} else if ((peer->security[OL_TXRX_PEER_SECURITY_UNICAST].sec_type
!= htt_sec_type_wapi) &&
- (A_STATUS_OK == adf_nbuf_is_dhcp_pkt(tx_nbuf))) {
+ adf_nbuf_is_dhcp_pkt(tx_nbuf)) {
/* DHCP frame to go with voice priority */
tid = TX_DHCP_TID;
}
diff --git a/CORE/SERVICES/COMMON/adf/adf_nbuf.c b/CORE/SERVICES/COMMON/adf/adf_nbuf.c
index fb4dcfa176ce..b8066b7da5ba 100644
--- a/CORE/SERVICES/COMMON/adf/adf_nbuf.c
+++ b/CORE/SERVICES/COMMON/adf/adf_nbuf.c
@@ -804,11 +804,10 @@ __adf_nbuf_data_get_ipv6_proto(uint8_t *data)
*
* This func. checks whether it is a DHCP packet or not.
*
- * Return: A_STATUS_OK if it is a DHCP packet
- * A_STATUS_FAILED if not
+ * Return: TRUE if it is a DHCP packet
+ * FALSE if not
*/
-a_status_t
-__adf_nbuf_data_is_dhcp_pkt(uint8_t *data)
+bool __adf_nbuf_data_is_dhcp_pkt(uint8_t *data)
{
a_uint16_t SPort;
a_uint16_t DPort;
@@ -823,11 +822,11 @@ __adf_nbuf_data_is_dhcp_pkt(uint8_t *data)
((ADF_NBUF_TRAC_DHCP_CLI_PORT == adf_os_cpu_to_be16(SPort)) &&
(ADF_NBUF_TRAC_DHCP_SRV_PORT == adf_os_cpu_to_be16(DPort))))
{
- return A_STATUS_OK;
+ return true;
}
else
{
- return A_STATUS_FAILED;
+ return false;
}
}
@@ -837,11 +836,10 @@ __adf_nbuf_data_is_dhcp_pkt(uint8_t *data)
*
* This func. checks whether it is a EAPOL packet or not.
*
- * Return: A_STATUS_OK if it is a EAPOL packet
- * A_STATUS_FAILED if not
+ * Return: TRUE if it is a EAPOL packet
+ * FALSE if not
*/
-a_status_t
-__adf_nbuf_data_is_eapol_pkt(uint8_t *data)
+bool __adf_nbuf_data_is_eapol_pkt(uint8_t *data)
{
a_uint16_t ether_type;
@@ -849,11 +847,11 @@ __adf_nbuf_data_is_eapol_pkt(uint8_t *data)
ADF_NBUF_TRAC_ETH_TYPE_OFFSET));
if (ADF_NBUF_TRAC_EAPOL_ETH_TYPE == adf_os_cpu_to_be16(ether_type))
{
- return A_STATUS_OK;
+ return true;
}
else
{
- return A_STATUS_FAILED;
+ return false;
}
}
diff --git a/CORE/SERVICES/COMMON/adf/adf_nbuf.h b/CORE/SERVICES/COMMON/adf/adf_nbuf.h
index 0be7147ba571..5d367c20f605 100644
--- a/CORE/SERVICES/COMMON/adf/adf_nbuf.h
+++ b/CORE/SERVICES/COMMON/adf/adf_nbuf.h
@@ -1549,11 +1549,11 @@ adf_nbuf_data_get_ipv6_proto(uint8_t *data)
*
* This func. checks whether it is a DHCP packet or not.
*
- * Return: A_STATUS_OK if it is a DHCP packet
- * A_STATUS_FAILED if not
+ * Return: TRUE if it is a DHCP packet
+ * FALSE if not
*/
-static inline a_status_t
-adf_nbuf_is_dhcp_pkt(adf_nbuf_t buf)
+static inline
+bool adf_nbuf_is_dhcp_pkt(adf_nbuf_t buf)
{
return __adf_nbuf_data_is_dhcp_pkt(adf_nbuf_data(buf));
}
@@ -1564,11 +1564,11 @@ adf_nbuf_is_dhcp_pkt(adf_nbuf_t buf)
*
* This func. checks whether it is a DHCP packet or not.
*
- * Return: A_STATUS_OK if it is a DHCP packet
- * A_STATUS_FAILED if not
+ * Return: TRUE if it is a DHCP packet
+ * FALSE if not
*/
-static inline a_status_t
-adf_nbuf_data_is_dhcp_pkt(uint8_t *data)
+static inline
+bool adf_nbuf_data_is_dhcp_pkt(uint8_t *data)
{
return __adf_nbuf_data_is_dhcp_pkt(data);
}
@@ -1579,11 +1579,11 @@ adf_nbuf_data_is_dhcp_pkt(uint8_t *data)
*
* This func. checks whether it is a EAPOL packet or not.
*
- * Return: A_STATUS_OK if it is a EAPOL packet
- * A_STATUS_FAILED if not
+ * Return: TRUE if it is a EAPOL packet
+ * FALSE if not
*/
-static inline a_status_t
-adf_nbuf_is_eapol_pkt(adf_nbuf_t buf)
+static inline
+bool adf_nbuf_is_eapol_pkt(adf_nbuf_t buf)
{
return __adf_nbuf_data_is_eapol_pkt(adf_nbuf_data(buf));
}
@@ -1594,11 +1594,11 @@ adf_nbuf_is_eapol_pkt(adf_nbuf_t buf)
*
* This func. checks whether it is a EAPOL packet or not.
*
- * Return: A_STATUS_OK if it is a EAPOL packet
- * A_STATUS_FAILED if not
+ * Return: TRUE if it is a EAPOL packet
+ * FALSE if not
*/
-static inline a_status_t
-adf_nbuf_data_is_eapol_pkt(uint8_t *data)
+static inline
+bool adf_nbuf_data_is_eapol_pkt(uint8_t *data)
{
return __adf_nbuf_data_is_eapol_pkt(data);
}
diff --git a/CORE/SERVICES/COMMON/adf/adf_trace.c b/CORE/SERVICES/COMMON/adf/adf_trace.c
index a281f29c7c24..2fda4e21f246 100644
--- a/CORE/SERVICES/COMMON/adf/adf_trace.c
+++ b/CORE/SERVICES/COMMON/adf/adf_trace.c
@@ -438,7 +438,7 @@ bool adf_log_eapol_pkt(uint8_t session_id, struct sk_buff *skb,
if ((adf_dp_get_proto_bitmap() & NBUF_PKT_TRAC_TYPE_EAPOL) &&
((dir == ADF_TX && ADF_NBUF_GET_IS_EAPOL(skb)) ||
- (dir == ADF_RX && adf_nbuf_is_eapol_pkt(skb) == true))) {
+ (dir == ADF_RX && adf_nbuf_is_eapol_pkt(skb)))) {
subtype = adf_nbuf_get_eapol_subtype(skb);
DPTRACE(adf_dp_trace_proto_pkt(ADF_DP_TRACE_EAPOL_PACKET_RECORD,
@@ -470,7 +470,7 @@ bool adf_log_dhcp_pkt(uint8_t session_id, struct sk_buff *skb,
if ((adf_dp_get_proto_bitmap() & NBUF_PKT_TRAC_TYPE_DHCP) &&
((dir == ADF_TX && ADF_NBUF_GET_IS_DHCP(skb)) ||
- (dir == ADF_RX && adf_nbuf_is_dhcp_pkt(skb) == true))) {
+ (dir == ADF_RX && adf_nbuf_is_dhcp_pkt(skb)))) {
subtype = adf_nbuf_get_dhcp_subtype(skb);
DPTRACE(adf_dp_trace_proto_pkt(ADF_DP_TRACE_DHCP_PACKET_RECORD,
@@ -503,7 +503,7 @@ bool adf_log_arp_pkt(uint8_t session_id, struct sk_buff *skb,
if ((adf_dp_get_proto_bitmap() & NBUF_PKT_TRAC_TYPE_ARP) &&
((dir == ADF_TX && ADF_NBUF_GET_IS_ARP(skb)) ||
- (dir == ADF_RX && adf_nbuf_is_ipv4_arp_pkt(skb) == true))){
+ (dir == ADF_RX && adf_nbuf_is_ipv4_arp_pkt(skb)))){
proto_subtype = adf_nbuf_get_arp_subtype(skb);
diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
index 0961dd90e0de..13a1339a947f 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h
@@ -415,8 +415,8 @@ bool __adf_nbuf_data_is_ipv4_udp_pkt(uint8_t *data);
bool __adf_nbuf_data_is_ipv4_tcp_pkt(uint8_t *data);
bool __adf_nbuf_data_is_ipv6_udp_pkt(uint8_t *data);
bool __adf_nbuf_data_is_ipv6_tcp_pkt(uint8_t *data);
-a_status_t __adf_nbuf_data_is_dhcp_pkt(uint8_t *data);
-a_status_t __adf_nbuf_data_is_eapol_pkt(uint8_t *data);
+bool __adf_nbuf_data_is_dhcp_pkt(uint8_t *data);
+bool __adf_nbuf_data_is_eapol_pkt(uint8_t *data);
bool __adf_nbuf_data_is_ipv4_arp_pkt(uint8_t *data);
enum adf_proto_subtype __adf_nbuf_data_get_dhcp_subtype(uint8_t *data);
enum adf_proto_subtype __adf_nbuf_data_get_eapol_subtype(uint8_t *data);
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 1e063c8059a6..9e134539bf22 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -21022,8 +21022,7 @@ wma_wow_get_pkt_proto_subtype(uint8_t *data,
return ADF_PROTO_INVALID;
} else if (proto_type == ADF_NBUF_TRAC_UDP_TYPE) {
if (len >= WMA_IS_DHCP_GET_MIN_LEN) {
- if (adf_nbuf_data_is_dhcp_pkt(data) ==
- A_STATUS_OK) {
+ if (adf_nbuf_data_is_dhcp_pkt(data)) {
if (len >=
WMA_DHCP_SUBTYPE_GET_MIN_LEN)
return adf_nbuf_data_get_dhcp_subtype(data);
diff --git a/CORE/VOSS/src/vos_packet.c b/CORE/VOSS/src/vos_packet.c
index 16228efb25ad..db8e10dc3977 100644
--- a/CORE/VOSS/src/vos_packet.c
+++ b/CORE/VOSS/src/vos_packet.c
@@ -271,7 +271,7 @@ v_U8_t vos_pkt_get_proto_type
/* EAPOL Tracking enabled */
if (VOS_PKT_TRAC_TYPE_EAPOL & tracking_map)
{
- if (adf_nbuf_is_eapol_pkt(skb) == A_STATUS_OK) {
+ if (adf_nbuf_is_eapol_pkt(skb)) {
pkt_proto_type = VOS_PKT_TRAC_TYPE_EAPOL;
return pkt_proto_type;
}
@@ -280,7 +280,7 @@ v_U8_t vos_pkt_get_proto_type
/* DHCP Tracking enabled */
if (VOS_PKT_TRAC_TYPE_DHCP & tracking_map)
{
- if (adf_nbuf_is_dhcp_pkt(skb) == A_STATUS_OK) {
+ if (adf_nbuf_is_dhcp_pkt(skb)) {
pkt_proto_type = VOS_PKT_TRAC_TYPE_DHCP;
return pkt_proto_type;
}