diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 06:54:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-27 06:54:45 -0400 |
| commit | df69471290cbec7714f6d1fabd14f4e41219cee1 (patch) | |
| tree | 1a8d9d3fce98db7b4382c24994feba6fa771805f /drivers/net/r8169.c | |
| parent | d994af0d50efc96b2077978fe9f066992639d525 (diff) | |
| parent | 17393dd67c06c3912ff47b31268b648929715336 (diff) | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index a3e3895e5032..0f6f9747d255 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
| @@ -2792,7 +2792,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, | |||
| 2792 | pkt_size, PCI_DMA_FROMDEVICE); | 2792 | pkt_size, PCI_DMA_FROMDEVICE); |
| 2793 | rtl8169_mark_to_asic(desc, tp->rx_buf_sz); | 2793 | rtl8169_mark_to_asic(desc, tp->rx_buf_sz); |
| 2794 | } else { | 2794 | } else { |
| 2795 | pci_unmap_single(pdev, addr, pkt_size, | 2795 | pci_unmap_single(pdev, addr, tp->rx_buf_sz, |
| 2796 | PCI_DMA_FROMDEVICE); | 2796 | PCI_DMA_FROMDEVICE); |
| 2797 | tp->Rx_skbuff[entry] = NULL; | 2797 | tp->Rx_skbuff[entry] = NULL; |
| 2798 | } | 2798 | } |