Skip to content

Commit

Permalink
via-velocity: Fix velocity driver unmapping incorrect size.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Jones authored and David S. Miller committed Jun 22, 2009
1 parent 0314db6 commit f6b24ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/via-velocity.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f6b24ca

Please sign in to comment.