samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "qcacmn: Fix core_ctl_set_boost "off" ref count"

Browse Source
This commit is contained in:
Linux Build Service Account
2017-06-21 21:33:34 -07:00
committed by Gerrit - the friendly Code Review server
parent 6435046078 5d6386f288
commit 1f9a659707
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hif/src/hif_napi.c
View File

@@ -1559,7 +1559,7 @@ int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
} }
break; break;
case BLACKLIST_OFF: case BLACKLIST_OFF:
if (ref_count) if (ref_count) {
ref_count--; ref_count--;
rc = 0; rc = 0;
if (ref_count == 0) { if (ref_count == 0) {
@@ -1568,6 +1568,7 @@ int hif_napi_cpu_blacklist(struct qca_napi_data *napid,
rc, ref_count); rc, ref_count);
hif_napi_bl_irq(napid, false); hif_napi_bl_irq(napid, false);
} }
}
break; break;
default: default:
NAPI_DEBUG("Invalid blacklist op: %d", op); NAPI_DEBUG("Invalid blacklist op: %d", op);

11
qdf/inc/qdf_nbuf.h
View File

@@ -212,9 +212,11 @@ struct mon_rx_status {
#define ARP_REQUEST (1) #define ARP_REQUEST (1)
#define ARP_RESPONSE (2) #define ARP_RESPONSE (2)
/* IPV4 Related Mask */ /* IPV4 header fields offset values */
#define IPV4_PKT_LEN_OFFSET 16 #define IPV4_PKT_LEN_OFFSET 16
#define IPV4_TCP_SEQ_NUM_OFFSET 38 #define IPV4_TCP_SEQ_NUM_OFFSET 38
#define IPV4_SRC_ADDR_OFFSET 26
#define IPV4_DST_ADDR_OFFSET 30
#define IPV4_SRC_PORT_OFFSET 34 #define IPV4_SRC_PORT_OFFSET 34
#define IPV4_DST_PORT_OFFSET 36 #define IPV4_DST_PORT_OFFSET 36
@@ -224,9 +226,14 @@ struct mon_rx_status {
#define ICMP_REQUEST 0x08 #define ICMP_REQUEST 0x08
#define ICMP_RESPONSE 0x00 #define ICMP_RESPONSE 0x00
/* IPV6 Related Mask */ #define IPV6_ADDR_STR "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:"\
"%02x%02x:%02x%02x"
/* IPV6 header fields offset values */
#define IPV6_PKT_LEN_OFFSET 18 #define IPV6_PKT_LEN_OFFSET 18
#define IPV6_TCP_SEQ_NUM_OFFSET 58 #define IPV6_TCP_SEQ_NUM_OFFSET 58
#define IPV6_SRC_ADDR_OFFSET 22
#define IPV6_DST_ADDR_OFFSET 38
#define IPV6_SRC_PORT_OFFSET 54 #define IPV6_SRC_PORT_OFFSET 54
#define IPV6_DST_PORT_OFFSET 56 #define IPV6_DST_PORT_OFFSET 56

6
wlan_cfg/wlan_cfg.c
View File

@@ -38,8 +38,6 @@
#define RXDMA_MONITOR_DEST_RING_SIZE 2048 #define RXDMA_MONITOR_DEST_RING_SIZE 2048
#define RXDMA_MONITOR_STATUS_RING_SIZE 2048 #define RXDMA_MONITOR_STATUS_RING_SIZE 2048
#define WLAN_CFG_NUM_TX_DESC 1024
#define WLAN_CFG_NUM_TX_EXT_DESC 1024
#ifdef TX_PER_PDEV_DESC_POOL #ifdef TX_PER_PDEV_DESC_POOL
#define WLAN_CFG_NUM_TX_DESC_POOL MAX_PDEV_CNT #define WLAN_CFG_NUM_TX_DESC_POOL MAX_PDEV_CNT
@@ -97,10 +95,14 @@
#define WLAN_CFG_PER_PDEV_RX_RING 0 #define WLAN_CFG_PER_PDEV_RX_RING 0
#define NUM_RXDMA_RINGS_PER_PDEV 2 #define NUM_RXDMA_RINGS_PER_PDEV 2
#define WLAN_LRO_ENABLE 1 #define WLAN_LRO_ENABLE 1
#define WLAN_CFG_NUM_TX_DESC 1024
#define WLAN_CFG_NUM_TX_EXT_DESC 1024
#else #else
#define WLAN_CFG_PER_PDEV_RX_RING 1 #define WLAN_CFG_PER_PDEV_RX_RING 1
#define NUM_RXDMA_RINGS_PER_PDEV 1 #define NUM_RXDMA_RINGS_PER_PDEV 1
#define WLAN_LRO_ENABLE 0 #define WLAN_LRO_ENABLE 0
#define WLAN_CFG_NUM_TX_DESC (16 << 10)
#define WLAN_CFG_NUM_TX_EXT_DESC (8 << 10)
#endif #endif
#ifdef WLAN_RX_HASH #ifdef WLAN_RX_HASH