diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:04:30 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:04:30 -0700 |
| commit | 4e111751cfcb75f26d2725eab934b6eb91a3d115 (patch) | |
| tree | b3d63b5b44bd2036db6e0f0b2e81769c84cc5ca3 /drivers/net/natsemi.c | |
| parent | ca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| download | kernel_samsung_tuna-4e111751cfcb75f26d2725eab934b6eb91a3d115.zip kernel_samsung_tuna-4e111751cfcb75f26d2725eab934b6eb91a3d115.tar.gz kernel_samsung_tuna-4e111751cfcb75f26d2725eab934b6eb91a3d115.tar.bz2 | |
Merge commit 'v3.0' into android-3.0
Diffstat (limited to 'drivers/net/natsemi.c')
| -rw-r--r-- | drivers/net/natsemi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 8f8b65a..60f46bc 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -140,7 +140,7 @@ MODULE_LICENSE("GPL"); module_param(mtu, int, 0); module_param(debug, int, 0); module_param(rx_copybreak, int, 0); -module_param(dspcfg_workaround, int, 1); +module_param(dspcfg_workaround, int, 0); module_param_array(options, int, NULL, 0); module_param_array(full_duplex, int, NULL, 0); MODULE_PARM_DESC(mtu, "DP8381x MTU (all boards)"); @@ -2028,8 +2028,8 @@ static void drain_rx(struct net_device *dev) np->rx_ring[i].cmd_status = 0; np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */ if (np->rx_skbuff[i]) { - pci_unmap_single(np->pci_dev, - np->rx_dma[i], buflen, + pci_unmap_single(np->pci_dev, np->rx_dma[i], + buflen + NATSEMI_PADDING, PCI_DMA_FROMDEVICE); dev_kfree_skb(np->rx_skbuff[i]); } |