Fix suspend/resume on via-velocity
Hi!
This fixes suspend-resume on via-velocity. It was confused w.r.t. pointers... Please apply,
Signed-off-by Pavel Machek <[email protected]>
Pavel
drivers/net/via-velocity.c +4 -2
@@ -3212,7 +3212,8 @@static int velocity_suspend (struct pci_dev *pdev,pm_message_t state) { -struct velocity_info *vptr =pci_get_drvdata (pdev); +struct net_device *dev =pci_get_drvdata (pdev); +struct velocity_info *vptr = dev->priv;unsigned long flags;if (!netif_running (vptr->dev))
@@ -3245,7 +3246,8 @@static int velocity_resume (struct pci_dev *pdev) { -struct velocity_info *vptr =pci_get_drvdata (pdev); +struct net_device *dev =pci_get_drvdata (pdev); +struct velocity_info *vptr = dev->priv;unsigned long flags;int i;
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Quoted 21 lines · Pavel Machek
Hi!
This fixes suspend-resume on via-velocity. It was confused w.r.t. pointers... Please apply,
Signed-off-by Pavel Machek <[email protected]>Pavel
drivers/net/via-velocity.c +2
-1@@ -3212,7 +3212,8 @@static int velocity_suspend (struct pci_dev *pdev,pm_message_t state) { -struct velocity_info *vptr =pci_get_drvdata (pdev); +struct net_device *dev =pci_get_drvdata (pdev); +struct velocity_info *vptr = dev->priv;unsigned long flags;if (!netif_running (vptr->dev))
drivers/net/via-velocity.c line 3250
Quoted 6 lines
drivers/net/via-velocity.c +2
-1@@ -3245,7 +3246,8 @@static int velocity_resume (struct pci_dev *pdev) { -struct velocity_info *vptr =pci_get_drvdata (pdev); +struct net_device *dev =pci_get_drvdata (pdev); +struct velocity_info *vptr = dev->priv;
Please use netdev_priv() rather than 'dev->priv', to eliminate a dereference.
Jeff
Hi!
This fixes suspend-resume on via-velocity. It was confused w.r.t. pointers... Now uses netdev_priv(). [Well, someone should run sed over that driver, there are many more dev->priv]. Please apply,
Signed-off-by Pavel Machek <[email protected]>
Pavel
drivers/net/via-velocity.c +4 -2
@@ -3210,9 +3210,10 @@return 0 ; }static int velocity_suspend (struct pci_dev *pdev,pm_message_t state) { -struct velocity_info *vptr =pci_get_drvdata (pdev); +struct net_device *dev =pci_get_drvdata (pdev); +struct velocity_info *vptr =netdev_priv (dev);unsigned long flags;if (!netif_running (vptr->dev))
@@ -3245,7 +3246,8 @@static int velocity_resume (struct pci_dev *pdev) { -struct velocity_info *vptr =pci_get_drvdata (pdev); +struct net_device *dev =pci_get_drvdata (pdev); +struct velocity_info *vptr =netdev_priv (dev);unsigned long flags;int i;
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!