diff options
Diffstat (limited to 'drivers/net/via-velocity.c')
-rw-r--r-- | drivers/net/via-velocity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index b02f7adff5dc..3ba35956327a 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -1847,7 +1847,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_ | |||
1847 | */ | 1847 | */ |
1848 | if (tdinfo->skb_dma) { | 1848 | if (tdinfo->skb_dma) { |
1849 | 1849 | ||
1850 | pktlen = (skb->len > ETH_ZLEN ? : ETH_ZLEN); | 1850 | pktlen = max_t(unsigned int, skb->len, ETH_ZLEN); |
1851 | for (i = 0; i < tdinfo->nskb_dma; i++) { | 1851 | for (i = 0; i < tdinfo->nskb_dma; i++) { |
1852 | #ifdef VELOCITY_ZERO_COPY_SUPPORT | 1852 | #ifdef VELOCITY_ZERO_COPY_SUPPORT |
1853 | pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], le16_to_cpu(td->tdesc1.len), PCI_DMA_TODEVICE); | 1853 | pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], le16_to_cpu(td->tdesc1.len), PCI_DMA_TODEVICE); |