Skip to content

L
linux
Commit 739b7979 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 18727963
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 97 deletions
drivers/staging/rt2860/2860_main_dev.c
View file @ 739b7979
...@@ -170,7 +170,7 @@ static int rt2860_suspend( ...@@ -170,7 +170,7 @@ static int rt2860_suspend(
} }
else else
{ {
pAd = (PRTMP_ADAPTER)net_dev->priv; pAd = net_dev->ml_priv;
/* we can not use IFF_UP because ra0 down but ra1 up */ /* we can not use IFF_UP because ra0 down but ra1 up */
/* and 1 suspend/resume function for 1 module, not for each interface */ /* and 1 suspend/resume function for 1 module, not for each interface */
...@@ -249,7 +249,7 @@ static int rt2860_resume( ...@@ -249,7 +249,7 @@ static int rt2860_resume(
DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n"));
} }
else else
pAd = (PRTMP_ADAPTER)net_dev->priv; pAd = net_dev->ml_priv;
if (pAd != NULL) if (pAd != NULL)
{ {
...@@ -336,7 +336,7 @@ static VOID __devexit rt2860_remove_one( ...@@ -336,7 +336,7 @@ static VOID __devexit rt2860_remove_one(
IN struct pci_dev *pci_dev) IN struct pci_dev *pci_dev)
{ {
struct net_device *net_dev = pci_get_drvdata(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")); DBGPRINT(RT_DEBUG_TRACE, ("===> rt2860_remove_one\n"));
...@@ -765,7 +765,7 @@ rt2860_interrupt(int irq, void *dev_instance, struct pt_regs *regs) ...@@ -765,7 +765,7 @@ rt2860_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
#endif #endif
{ {
struct net_device *net_dev = (struct net_device *) dev_instance; 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; INT_SOURCE_CSR_STRUC IntSource;
POS_COOKIE pObj; POS_COOKIE pObj;
...@@ -1300,7 +1300,7 @@ VOID rt2860_stop(struct net_device *net_dev) ...@@ -1300,7 +1300,7 @@ VOID rt2860_stop(struct net_device *net_dev)
DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n")); DBGPRINT(RT_DEBUG_ERROR, ("net_dev == NULL!\n"));
} }
else else
pAd = (PRTMP_ADAPTER)net_dev->priv; pAd = net_dev->ml_priv;
if (pAd != NULL) if (pAd != NULL)
{ {
......
drivers/staging/rt2860/rt2860.h
View file @ 739b7979
...@@ -242,7 +242,7 @@ rt2860_interrupt(int irq, void *dev_instance, struct pt_regs *regs); ...@@ -242,7 +242,7 @@ rt2860_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
#endif #endif
#define RT28XX_IRQ_REQUEST(net_dev) \ #define RT28XX_IRQ_REQUEST(net_dev) \
{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \ { PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \
POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \ POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \
RTMP_MSI_ENABLE(_pAd); \ RTMP_MSI_ENABLE(_pAd); \
if ((retval = request_irq(_pObj->pci_dev->irq, \ if ((retval = request_irq(_pObj->pci_dev->irq, \
...@@ -253,7 +253,7 @@ rt2860_interrupt(int irq, void *dev_instance, struct pt_regs *regs); ...@@ -253,7 +253,7 @@ rt2860_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#define RT28XX_IRQ_RELEASE(net_dev) \ #define RT28XX_IRQ_RELEASE(net_dev) \
{ PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->priv); \ { PRTMP_ADAPTER _pAd = (PRTMP_ADAPTER)((net_dev)->ml_priv); \
POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \ POS_COOKIE _pObj = (POS_COOKIE)(_pAd->OS_Cookie); \
synchronize_irq(_pObj->pci_dev->irq); \ synchronize_irq(_pObj->pci_dev->irq); \
free_irq(_pObj->pci_dev->irq, (net_dev)); \ free_irq(_pObj->pci_dev->irq, (net_dev)); \
......
drivers/staging/rt2860/rt_main_dev.c
View file @ 739b7979
...@@ -135,7 +135,7 @@ Return Value: ...@@ -135,7 +135,7 @@ Return Value:
*/ */
int MainVirtualIF_close(IN struct net_device *net_dev) int MainVirtualIF_close(IN struct net_device *net_dev)
{ {
RTMP_ADAPTER *pAd = net_dev->priv; RTMP_ADAPTER *pAd = net_dev->ml_priv;
// Sanity check for pAd // Sanity check for pAd
if (pAd == NULL) if (pAd == NULL)
...@@ -174,7 +174,7 @@ Return Value: ...@@ -174,7 +174,7 @@ Return Value:
*/ */
int MainVirtualIF_open(IN struct net_device *net_dev) int MainVirtualIF_open(IN struct net_device *net_dev)
{ {
RTMP_ADAPTER *pAd = net_dev->priv; RTMP_ADAPTER *pAd = net_dev->ml_priv;
// Sanity check for pAd // Sanity check for pAd
if (pAd == NULL) if (pAd == NULL)
...@@ -216,7 +216,7 @@ Return Value: ...@@ -216,7 +216,7 @@ Return Value:
int rt28xx_close(IN PNET_DEV dev) int rt28xx_close(IN PNET_DEV dev)
{ {
struct net_device * net_dev = (struct net_device *)dev; struct net_device * net_dev = (struct net_device *)dev;
RTMP_ADAPTER *pAd = net_dev->priv; RTMP_ADAPTER *pAd = net_dev->ml_priv;
BOOLEAN Cancelled = FALSE; BOOLEAN Cancelled = FALSE;
UINT32 i = 0; UINT32 i = 0;
...@@ -396,7 +396,7 @@ int rt28xx_close(IN PNET_DEV dev) ...@@ -396,7 +396,7 @@ int rt28xx_close(IN PNET_DEV dev)
static int rt28xx_init(IN struct net_device *net_dev) static int rt28xx_init(IN struct net_device *net_dev)
{ {
PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv; PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
UINT index; UINT index;
UCHAR TmpPhy; UCHAR TmpPhy;
NDIS_STATUS Status; NDIS_STATUS Status;
...@@ -605,8 +605,8 @@ static int rt28xx_init(IN struct net_device *net_dev) ...@@ -605,8 +605,8 @@ static int rt28xx_init(IN struct net_device *net_dev)
#endif // DOT11_N_SUPPORT // #endif // DOT11_N_SUPPORT //
RT28XX_IRQ_RELEASE(net_dev); RT28XX_IRQ_RELEASE(net_dev);
// shall not set priv to NULL here because the priv didn't been free yet. // shall not set ml_priv to NULL here because the ml_priv didn't been free yet.
//net_dev->priv = 0; //net_dev->ml_priv = 0;
#ifdef INF_AMAZON_SE #ifdef INF_AMAZON_SE
err0: err0:
#endif // INF_AMAZON_SE // #endif // INF_AMAZON_SE //
...@@ -633,7 +633,7 @@ Return Value: ...@@ -633,7 +633,7 @@ Return Value:
int rt28xx_open(IN PNET_DEV dev) int rt28xx_open(IN PNET_DEV dev)
{ {
struct net_device * net_dev = (struct net_device *)dev; struct net_device * net_dev = (struct net_device *)dev;
PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv; PRTMP_ADAPTER pAd = net_dev->ml_priv;
int retval = 0; int retval = 0;
POS_COOKIE pObj; POS_COOKIE pObj;
...@@ -642,7 +642,7 @@ int rt28xx_open(IN PNET_DEV dev) ...@@ -642,7 +642,7 @@ int rt28xx_open(IN PNET_DEV dev)
if (pAd == NULL) if (pAd == NULL)
{ {
/* if 1st open fail, pAd will be free; /* if 1st open fail, pAd will be free;
So the net_dev->priv will be NULL in 2rd open */ So the net_dev->ml_priv will be NULL in 2rd open */
return -1; return -1;
} }
...@@ -1303,7 +1303,7 @@ INT __devinit rt28xx_probe( ...@@ -1303,7 +1303,7 @@ INT __devinit rt28xx_probe(
if (status != NDIS_STATUS_SUCCESS) if (status != NDIS_STATUS_SUCCESS)
goto err_out_free_netdev; goto err_out_free_netdev;
net_dev->priv = (PVOID)pAd; net_dev->ml_priv = (PVOID)pAd;
pAd->net_dev = net_dev; // must be before RT28XXNetDevInit() pAd->net_dev = net_dev; // must be before RT28XXNetDevInit()
RT28XXNetDevInit(_dev_p, net_dev, pAd); RT28XXNetDevInit(_dev_p, net_dev, pAd);
...@@ -1399,7 +1399,7 @@ Return Value: ...@@ -1399,7 +1399,7 @@ Return Value:
int rt28xx_packet_xmit(struct sk_buff *skb) int rt28xx_packet_xmit(struct sk_buff *skb)
{ {
struct net_device *net_dev = skb->dev; struct net_device *net_dev = skb->dev;
PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; PRTMP_ADAPTER pAd = net_dev->ml_priv;
int status = 0; int status = 0;
PNDIS_PACKET pPacket = (PNDIS_PACKET) skb; PNDIS_PACKET pPacket = (PNDIS_PACKET) skb;
...@@ -1478,7 +1478,7 @@ INT rt28xx_send_packets( ...@@ -1478,7 +1478,7 @@ INT rt28xx_send_packets(
IN struct sk_buff *skb_p, IN struct sk_buff *skb_p,
IN struct net_device *net_dev) IN struct net_device *net_dev)
{ {
RTMP_ADAPTER *pAd = net_dev->priv; RTMP_ADAPTER *pAd = net_dev->ml_priv;
if (!(net_dev->flags & IFF_UP)) if (!(net_dev->flags & IFF_UP))
{ {
RELEASE_NDIS_PACKET(pAd, (PNDIS_PACKET)skb_p, NDIS_STATUS_FAILURE); RELEASE_NDIS_PACKET(pAd, (PNDIS_PACKET)skb_p, NDIS_STATUS_FAILURE);
...@@ -1540,7 +1540,7 @@ void CfgInitHook(PRTMP_ADAPTER pAd) ...@@ -1540,7 +1540,7 @@ void CfgInitHook(PRTMP_ADAPTER pAd)
struct iw_statistics *rt28xx_get_wireless_stats( struct iw_statistics *rt28xx_get_wireless_stats(
IN struct net_device *net_dev) IN struct net_device *net_dev)
{ {
PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv; PRTMP_ADAPTER pAd = net_dev->ml_priv;
DBGPRINT(RT_DEBUG_TRACE, ("rt28xx_get_wireless_stats --->\n")); DBGPRINT(RT_DEBUG_TRACE, ("rt28xx_get_wireless_stats --->\n"));
...@@ -1592,18 +1592,18 @@ INT rt28xx_ioctl( ...@@ -1592,18 +1592,18 @@ INT rt28xx_ioctl(
if (net_dev->priv_flags == INT_MAIN) if (net_dev->priv_flags == INT_MAIN)
{ {
pAd = net_dev->priv; pAd = net_dev->ml_priv;
} }
else else
{ {
pVirtualAd = net_dev->priv; pVirtualAd = net_dev->ml_priv;
pAd = pVirtualAd->RtmpDev->priv; pAd = pVirtualAd->RtmpDev->ml_priv;
} }
if (pAd == NULL) if (pAd == NULL)
{ {
/* if 1st open fail, pAd will be free; /* if 1st open fail, pAd will be free;
So the net_dev->priv will be NULL in 2rd open */ So the net_dev->ml_priv will be NULL in 2rd open */
return -ENETDOWN; return -ENETDOWN;
} }
...@@ -1640,7 +1640,7 @@ struct net_device_stats *RT28xx_get_ether_stats( ...@@ -1640,7 +1640,7 @@ struct net_device_stats *RT28xx_get_ether_stats(
RTMP_ADAPTER *pAd = NULL; RTMP_ADAPTER *pAd = NULL;
if (net_dev) if (net_dev)
pAd = net_dev->priv; pAd = net_dev->ml_priv;
if (pAd) if (pAd)
{ {
......
drivers/staging/rt2860/sta_ioctl.c
View file @ 739b7979
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7