Merge "qcacmn: Fix the page mask used for Tx Descriptor"

This commit is contained in:
Linux Build Service Account 2017-07-27 23:07:49 -07:00 • committed by Gerrit - the friendly Code Review server
commit 653d3cab07
2 changed files with 10 additions and 9 deletions

View file

@ -1266,7 +1266,8 @@ done:
nbuf);
/* Intrabss-fwd */
if (vdev->opmode != wlan_op_mode_sta)
if ((vdev->opmode != wlan_op_mode_sta) &&
!vdev->nawds_enabled)
if (dp_rx_intrabss_fwd(soc,
peer,
rx_tlv_hdr,

View file

@ -25,16 +25,16 @@
/**
* 21 bits cookie
* 3 bits ring id 0 ~ 7, mask 0x1C0000, offset 18
* 8 bits page id 0 ~ 255, mask 0x03C800, offset 10
* 10 bits offset id 0 ~ 1023 mask 0x0003FF, offset 0
* 3 bits ring id 0 ~ 7,
* 8 bits page id 0 ~ 512
* 5 bits offset id 0 ~ 31 (Desc size = 128, Num descs per page = 4096/128 = 32)
*/
/* ???Ring ID needed??? */
#define DP_TX_DESC_ID_POOL_MASK 0x1C0000
#define DP_TX_DESC_ID_POOL_OS 18
#define DP_TX_DESC_ID_PAGE_MASK 0x03FC00
#define DP_TX_DESC_ID_PAGE_OS 10
#define DP_TX_DESC_ID_OFFSET_MASK 0x0003FF
#define DP_TX_DESC_ID_POOL_MASK 0x01C000
#define DP_TX_DESC_ID_POOL_OS 14
#define DP_TX_DESC_ID_PAGE_MASK 0x003FE0
#define DP_TX_DESC_ID_PAGE_OS 5
#define DP_TX_DESC_ID_OFFSET_MASK 0x00001F
#define DP_TX_DESC_ID_OFFSET_OS 0
#ifdef QCA_LL_TX_FLOW_CONTROL_V2