[patch 022/108] via-velocity: Fix velocity driver unmapping incorrect size.

Greg KH
2009-07-01T00:52:56Z

[-- Attachment #1: via-velocity-fix-velocity-driver-unmapping-incorrect-size.patch --]
[-- Type: text/plain, Size: 1002 bytes --]

2.6.30-stable review patch. If anyone has any objections, please let us know.

------------------

From: Dave Jones <davej@redhat.com>

[ 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>

---
drivers/net/via-velocity.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1845,7 +1845,7 @@ static void velocity_free_tx_buf(struct
*/
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);