diff options
| author |   Dave Jones <davej@redhat.com> | 2009-06-21 22:42:30 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-06-21 22:42:30 -0700 |
| commit | f6b24caaf933a466397915a08e30e885a32f905a (patch) | |
| tree | 98095c87be1d741bd3ca0ccb5ee0ad6f776a564b /drivers/net/via-velocity.c | |
| parent | mlx4_en: Remove redundant refill code on RX (diff) | |
| download | linux-dev-f6b24caaf933a466397915a08e30e885a32f905a.tar.xz linux-dev-f6b24caaf933a466397915a08e30e885a32f905a.zip | |
via-velocity: Fix velocity driver unmapping incorrect size.
When a packet is greater than ETH_ZLEN, we end up assigning the
boolean result of a comparison to the size we unmap.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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_ */ if (tdinfo->skb_dma) { - pktlen = (skb->len > ETH_ZLEN ? : ETH_ZLEN); + pktlen = max_t(unsigned int, skb->len, ETH_ZLEN); for (i = 0; i < tdinfo->nskb_dma; i++) { #ifdef VELOCITY_ZERO_COPY_SUPPORT pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], le16_to_cpu(td->tdesc1.len), PCI_DMA_TODEVICE); |