| Message ID | 1561396141-23382-1-git-send-email-msinada@codeaurora.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [1/5] ath11k: removed duplicated functionality | expand |
Muna Sinada <msinada@codeaurora.org> wrote: > Removed duplicated functionality in ath11k_hal_desc_reo_parse_err() and > replaced with function call to ath11k_hal_rx_reo_entl_paddr_get(). > > Signed-off-by: Muna Sinada <msinada@codeaurora.org> Does not apply and sha1 information is incorrect. Remember to use ath11k-bringup branch as baseline AND no extra patches applied. Applying: ath11k: removed duplicated functionality Applying: ath11k: changed parameter from u8 * to struct sk_buff * fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/dp_rx.c). error: could not build fake ancestor Patch failed at 0002 ath11k: changed parameter from u8 * to struct sk_buff * 5 patches set to Changes Requested. 11013825 [1/5] ath11k: removed duplicated functionality 11013827 [2/5] ath11k: changed parameter from u8 * to struct sk_buff * 11013829 [3/5] ath11k: comments added to explain purpose 11013831 [4/5] ath11k: added RMB to return_buffer_manager description 11013833 [5/5] ath11k: add hal dbg mask and utilized for hal stats
diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c index 76b93f6c33cd..2d2d5cd5ea5f 100644 --- a/drivers/net/wireless/ath/ath11k/hal_rx.c +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c @@ -351,12 +351,7 @@ int ath11k_hal_desc_reo_parse_err(struct ath11k_base *ab, u32 *rx_desc, return -EINVAL; } - *paddr = (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, - desc->buf_addr_info.info1)) << 32) | - FIELD_GET(BUFFER_ADDR_INFO0_ADDR, - desc->buf_addr_info.info0); - *desc_bank = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - desc->buf_addr_info.info1); + ath11k_hal_rx_reo_ent_paddr_get(ab, rx_desc, paddr, desc_bank); return 0; }
Removed duplicated functionality in ath11k_hal_desc_reo_parse_err() and replaced with function call to ath11k_hal_rx_reo_entl_paddr_get(). Signed-off-by: Muna Sinada <msinada@codeaurora.org> --- drivers/net/wireless/ath/ath11k/hal_rx.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)