diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-05 14:19:51 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:52:12 -0800 |
| commit | 739b797941598529cc44e39d05227dbbe9254275 (patch) | |
| tree | 85c5ef4cb3a883b7188534e81e1f8c0ff918d8f7 /drivers/staging/rt2860/2860_main_dev.c | |
| parent | Staging: rt2860: disable root hack for reading files (diff) | |
| download | linux-dev-739b797941598529cc44e39d05227dbbe9254275.tar.xz linux-dev-739b797941598529cc44e39d05227dbbe9254275.zip | |
Staging: rt2860: fix up netdev->priv usage
Now that netdev->priv is removed, fix the driver to use netdev->ml_priv
like it always should have been doing.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/2860_main_dev.c')
| -rw-r--r-- | drivers/staging/rt2860/2860_main_dev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/rt2860/2860_main_dev.c b/drivers/staging/rt2860/2860_main_dev.c index c29453641851..d65bdbc62762 100644 --- a/drivers/staging/rt2860/2860_main_dev.c +++ b/drivers/staging/rt2860/2860_main_dev.c @@ -170,7 +170,7 @@ static int rt2860_suspend( } else { - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = net_dev->ml_priv; /* we can not use IFF_UP because ra0 down but ra1 up */ /* and 1 suspend/resume function for 1 module, not for each interface */ @@ -249,7 +249,7 @@ static int rt2860_resume( DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); } else - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = net_dev->ml_priv; if (pAd != NULL) { @@ -336,7 +336,7 @@ static VOID __devexit rt2860_remove_one( IN struct pci_dev *pci_dev) { struct net_device *net_dev = pci_get_drvdata(pci_dev); - RTMP_ADAPTER *pAd = net_dev->priv; + RTMP_ADAPTER *pAd = net_dev->ml_priv; DBGPRINT(RT_DEBUG_TRACE, ("===> rt2860_remove_one\n")); @@ -765,7 +765,7 @@ rt2860_interrupt(int irq, void *dev_instance, struct pt_regs *regs) #endif { struct net_device *net_dev = (struct net_device *) dev_instance; - PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; + PRTMP_ADAPTER pAd = net_dev->ml_priv; INT_SOURCE_CSR_STRUC IntSource; POS_COOKIE pObj; @@ -1300,7 +1300,7 @@ VOID rt2860_stop(struct net_device *net_dev) DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); } else - pAd = (PRTMP_ADAPTER)net_dev->priv; + pAd = net_dev->ml_priv; if (pAd != NULL) { |