diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-08-21 21:02:57 -0700 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-08-21 21:02:57 -0700 |
| commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
| tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /drivers/net/hamachi.c | |
| parent | c7e25e6e0b0486492c5faaf6312b37413642c48e (diff) | |
| parent | 93862d5e1ab875664c6cc95254fc365028a48bb1 (diff) | |
| download | linux-3.10-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.gz linux-3.10-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.bz2 linux-3.10-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.zip | |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'drivers/net/hamachi.c')
| -rw-r--r-- | drivers/net/hamachi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index a09041aa850..c274b3d77eb 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c @@ -648,13 +648,13 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev, ring_space = pci_alloc_consistent(pdev, TX_TOTAL_SIZE, &ring_dma); if (!ring_space) goto err_out_cleardev; - hmp->tx_ring = (struct hamachi_desc *)ring_space; + hmp->tx_ring = ring_space; hmp->tx_ring_dma = ring_dma; ring_space = pci_alloc_consistent(pdev, RX_TOTAL_SIZE, &ring_dma); if (!ring_space) goto err_out_unmap_tx; - hmp->rx_ring = (struct hamachi_desc *)ring_space; + hmp->rx_ring = ring_space; hmp->rx_ring_dma = ring_dma; /* Check for options being passed in */ |