via-velocity: remove null pointer check on array tdinfo->skb_dma
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9438451e73
commit
46dfc23e9e
|
@ -1724,24 +1724,21 @@ static void velocity_free_tx_buf(struct velocity_info *vptr,
|
||||||
struct velocity_td_info *tdinfo, struct tx_desc *td)
|
struct velocity_td_info *tdinfo, struct tx_desc *td)
|
||||||
{
|
{
|
||||||
struct sk_buff *skb = tdinfo->skb;
|
struct sk_buff *skb = tdinfo->skb;
|
||||||
|
int i;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Don't unmap the pre-allocated tx_bufs
|
* Don't unmap the pre-allocated tx_bufs
|
||||||
*/
|
*/
|
||||||
if (tdinfo->skb_dma) {
|
for (i = 0; i < tdinfo->nskb_dma; i++) {
|
||||||
int i;
|
size_t pktlen = max_t(size_t, skb->len, ETH_ZLEN);
|
||||||
|
|
||||||
for (i = 0; i < tdinfo->nskb_dma; i++) {
|
/* For scatter-gather */
|
||||||
size_t pktlen = max_t(size_t, skb->len, ETH_ZLEN);
|
if (skb_shinfo(skb)->nr_frags > 0)
|
||||||
|
pktlen = max_t(size_t, pktlen,
|
||||||
|
td->td_buf[i].size & ~TD_QUEUE);
|
||||||
|
|
||||||
/* For scatter-gather */
|
dma_unmap_single(vptr->dev, tdinfo->skb_dma[i],
|
||||||
if (skb_shinfo(skb)->nr_frags > 0)
|
le16_to_cpu(pktlen), DMA_TO_DEVICE);
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
dev_kfree_skb_irq(skb);
|
dev_kfree_skb_irq(skb);
|
||||||
tdinfo->skb = NULL;
|
tdinfo->skb = NULL;
|
||||||
|
|
Loading…
Reference in New Issue