| Message ID | 1561022229-854-1-git-send-email-vthiagar@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ac429efcdf8d2b2cf6e81317fd311aa291784d8e |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [V2,1/4] ath11k: Clean up void *per_transfer_context[] in ce | expand |
Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> wrote: > Since per_transfer_context is used as an array of skb pointer always > no need that to be an array of void *. > > Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> 4 patches applied to ath11k-bringup branch of ath.git, thanks. ac429efcdf8d ath11k: Clean up void *per_transfer_context[] in ce 4fd9eee9c2ef ath11k: Add peer.[ch] files for peer related util functions 9dff37f3c969 ath11k{dp, hal}: Endian macro related clean ups 74971a410d44 ath11k/dp_rx: Clean up void *rx_desc in struct ath11k_skb_rxcb
Kalle Valo <kvalo@codeaurora.org> writes: > Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> wrote: > >> Since per_transfer_context is used as an array of skb pointer always >> no need that to be an array of void *. >> >> Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> >> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> > > 4 patches applied to ath11k-bringup branch of ath.git, thanks. > > ac429efcdf8d ath11k: Clean up void *per_transfer_context[] in ce > 4fd9eee9c2ef ath11k: Add peer.[ch] files for peer related util functions > 9dff37f3c969 ath11k{dp, hal}: Endian macro related clean ups > 74971a410d44 ath11k/dp_rx: Clean up void *rx_desc in struct ath11k_skb_rxcb There were few conflicts. Very easy to resolve with 3-way merge but please check anyway.
On 2019-06-20 20:08, Kalle Valo wrote: > Kalle Valo <kvalo@codeaurora.org> writes: > >> Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> wrote: >> >>> Since per_transfer_context is used as an array of skb pointer always >>> no need that to be an array of void *. >>> >>> Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> >>> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> >> >> 4 patches applied to ath11k-bringup branch of ath.git, thanks. >> >> ac429efcdf8d ath11k: Clean up void *per_transfer_context[] in ce >> 4fd9eee9c2ef ath11k: Add peer.[ch] files for peer related util >> functions >> 9dff37f3c969 ath11k{dp, hal}: Endian macro related clean ups >> 74971a410d44 ath11k/dp_rx: Clean up void *rx_desc in struct >> ath11k_skb_rxcb > > There were few conflicts. Very easy to resolve with 3-way merge but > please check anyway. Looks good, thanks. Vasanth
diff --git a/drivers/net/wireless/ath/ath11k/ce.c b/drivers/net/wireless/ath/ath11k/ce.c index b9a57ec..048adc1 100644 --- a/drivers/net/wireless/ath/ath11k/ce.c +++ b/drivers/net/wireless/ath/ath11k/ce.c @@ -212,7 +212,7 @@ static int ath11k_ce_rx_post_pipe(struct ath11k_ce_pipe *pipe) } static int ath11k_ce_completed_recv_next(struct ath11k_ce_pipe *pipe, - void **context, int *nbytes) + struct sk_buff **context, int *nbytes) { struct ath11k_base *ab = pipe->sc; struct hal_srng *srng; @@ -270,8 +270,7 @@ static void ath11k_ce_recv_process_cb(struct ath11k_ce_pipe *pipe) int ret; __skb_queue_head_init(&list); - while (ath11k_ce_completed_recv_next(pipe, (void **)&skb, - &nbytes) == 0) { + while (ath11k_ce_completed_recv_next(pipe, &skb, &nbytes) == 0) { max_nbytes = skb->len + skb_tailroom(skb); dma_unmap_single(ab->dev, ATH11K_SKB_RXCB(skb)->paddr, max_nbytes, DMA_FROM_DEVICE); @@ -303,7 +302,7 @@ static void ath11k_ce_recv_process_cb(struct ath11k_ce_pipe *pipe) } static int ath11k_ce_completed_send_next(struct ath11k_ce_pipe *pipe, - void **transfer_contextp) + struct sk_buff **transfer_contextp) { struct ath11k_base *ab = pipe->sc; struct hal_srng *srng; @@ -349,7 +348,7 @@ static void ath11k_ce_send_done_cb(struct ath11k_ce_pipe *pipe) struct ath11k_base *ab = pipe->sc; struct sk_buff *skb; - while (ath11k_ce_completed_send_next(pipe, (void **)&skb) == 0) { + while (ath11k_ce_completed_send_next(pipe, &skb) == 0) { if (!skb) continue; diff --git a/drivers/net/wireless/ath/ath11k/ce.h b/drivers/net/wireless/ath/ath11k/ce.h index f9b5a0e..9f25bad 100644 --- a/drivers/net/wireless/ath/ath11k/ce.h +++ b/drivers/net/wireless/ath/ath11k/ce.h @@ -139,7 +139,7 @@ struct ath11k_ce_ring { u32 hal_ring_id; /* keep last */ - void *per_transfer_context[0]; + struct sk_buff *per_transfer_context[0]; }; struct ath11k_ce_pipe {
Since per_transfer_context is used as an array of skb pointer always no need that to be an array of void *. Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org> --- V2: - Dropped "[PATCH 4/5] ath11k: Clean up link_desc_addr buffer typecast" from the series. This will be addressed later. drivers/net/wireless/ath/ath11k/ce.c | 9 ++++----- drivers/net/wireless/ath/ath11k/ce.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-)