* [PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma
@ 2016-09-08 9:04 Colin King
2016-09-08 20:38 ` Francois Romieu
2016-09-10 1:17 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Colin King @ 2016-09-08 9:04 UTC (permalink / raw)
To: Francois Romieu, netdev; +Cc: linux-kernel
From: Colin Ian King <colin.king@canonical.com>
tdinfo->skb_dma is a 7 element array of dma_addr_t hence cannot be
null, so the pull pointer check on tdinfo->skb_dma is redundant.
Remove it.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/ethernet/via/via-velocity.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index f38696c..b1167a9 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -1724,24 +1724,21 @@ static void velocity_free_tx_buf(struct velocity_info *vptr,
struct velocity_td_info *tdinfo, struct tx_desc *td)
{
struct sk_buff *skb = tdinfo->skb;
+ int i;
/*
* Don't unmap the pre-allocated tx_bufs
*/
- if (tdinfo->skb_dma) {
- int i;
+ for (i = 0; i < tdinfo->nskb_dma; i++) {
+ size_t pktlen = max_t(size_t, skb->len, ETH_ZLEN);
- for (i = 0; i < tdinfo->nskb_dma; i++) {
- size_t pktlen = max_t(size_t, skb->len, ETH_ZLEN);
+ /* For scatter-gather */
+ if (skb_shinfo(skb)->nr_frags > 0)
+ pktlen = max_t(size_t, pktlen,
+ td->td_buf[i].size & ~TD_QUEUE);
- /* For scatter-gather */
- if (skb_shinfo(skb)->nr_frags > 0)
- pktlen = max_t(size_t, pktlen,
- td->td_buf[i].size & ~TD_QUEUE);
-
- dma_unmap_single(vptr->dev, tdinfo->skb_dma[i],
- le16_to_cpu(pktlen), DMA_TO_DEVICE);
- }
+ dma_unmap_single(vptr->dev, tdinfo->skb_dma[i],
+ le16_to_cpu(pktlen), DMA_TO_DEVICE);
}
dev_kfree_skb_irq(skb);
tdinfo->skb = NULL;
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma
2016-09-08 9:04 [PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma Colin King
@ 2016-09-08 20:38 ` Francois Romieu
2016-09-10 1:17 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Francois Romieu @ 2016-09-08 20:38 UTC (permalink / raw)
To: Colin King; +Cc: netdev, linux-kernel
Colin King <colin.king@canonical.com> :
> From: Colin Ian King <colin.king@canonical.com>
>
> tdinfo->skb_dma is a 7 element array of dma_addr_t hence cannot be
> null, so the pull pointer check on tdinfo->skb_dma is redundant.
> Remove it.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
--
Ueimor
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma
2016-09-08 9:04 [PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma Colin King
2016-09-08 20:38 ` Francois Romieu
@ 2016-09-10 1:17 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-09-10 1:17 UTC (permalink / raw)
To: colin.king; +Cc: romieu, netdev, linux-kernel
From: Colin King <colin.king@canonical.com>
Date: Thu, 8 Sep 2016 10:04:24 +0100
> From: Colin Ian King <colin.king@canonical.com>
>
> tdinfo->skb_dma is a 7 element array of dma_addr_t hence cannot be
> null, so the pull pointer check on tdinfo->skb_dma is redundant.
> Remove it.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied, thanks Colin.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-10 1:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-08 9:04 [PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma Colin King
2016-09-08 20:38 ` Francois Romieu
2016-09-10 1:17 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).