* Fix suspend/resume on via-velocity
@ 2005-03-11 14:11 Pavel Machek
2005-03-11 19:33 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2005-03-11 14:11 UTC (permalink / raw)
To: Andrew Morton, kernel list, jgarzik, linux-net
Hi!
This fixes suspend-resume on via-velocity. It was confused
w.r.t. pointers... Please apply,
Signed-off-by: Pavel Machek <pavel@suse.cz>
Pavel
--- clean-mm/drivers/net/via-velocity.c 2005-03-11 11:25:36.000000000 +0100
+++ linux/drivers/net/via-velocity.c 2005-03-11 10:06:05.000000000 +0100
@@ -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;
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Fix suspend/resume on via-velocity
2005-03-11 14:11 Fix suspend/resume on via-velocity Pavel Machek
@ 2005-03-11 19:33 ` Jeff Garzik
2005-03-12 19:11 ` Pavel Machek
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2005-03-11 19:33 UTC (permalink / raw)
To: Pavel Machek; +Cc: Andrew Morton, kernel list, linux-net
Pavel Machek wrote:
> Hi!
>
> This fixes suspend-resume on via-velocity. It was confused
> w.r.t. pointers... Please apply,
>
> Signed-off-by: Pavel Machek <pavel@suse.cz>
> Pavel
>
> --- clean-mm/drivers/net/via-velocity.c 2005-03-11 11:25:36.000000000 +0100
> +++ linux/drivers/net/via-velocity.c 2005-03-11 10:06:05.000000000 +0100
> @@ -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;
Please use netdev_priv() rather than 'dev->priv', to eliminate a
dereference.
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Fix suspend/resume on via-velocity
2005-03-11 19:33 ` Jeff Garzik
@ 2005-03-12 19:11 ` Pavel Machek
0 siblings, 0 replies; 3+ messages in thread
From: Pavel Machek @ 2005-03-12 19:11 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Andrew Morton, kernel list, linux-net
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 <pavel@suse.cz>
Pavel
--- clean/drivers/net/via-velocity.c 2005-01-22 21:24:52.000000000 +0100
+++ linux/drivers/net/via-velocity.c 2005-03-12 20:07:29.000000000 +0100
@@ -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;
--
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-03-12 19:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-11 14:11 Fix suspend/resume on via-velocity Pavel Machek
2005-03-11 19:33 ` Jeff Garzik
2005-03-12 19:11 ` Pavel Machek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.