diff options
| author | Dave Jones <davej@redhat.com> | 2009-06-21 22:42:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-02 16:49:43 -0700 |
| commit | e692eaafaf5d7c8aeef219959acaaa55702f5ebe (patch) | |
| tree | 89c7432b9563cd3a1ad7ab0f20940fbd598e3971 /drivers | |
| parent | 71d1ad90a58e00cf8aebd0e6c579c105d2ecb697 (diff) | |
via-velocity: Fix velocity driver unmapping incorrect size.
[ Upstream commit f6b24caaf933a466397915a08e30e885a32f905a ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -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 754a4b182c1d..b2816ad6f2a2 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -1845,7 +1845,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); |