Messages in this thread Patch in this message | | | Date | Tue, 25 Nov 2003 13:57:14 +0100 | From | Rask Ingemann Lambertsen <> | Subject | Re: [PATCH/CFT] de2104x fixes |
| |
On Fri, Nov 21, 2003 at 01:50:24PM -0500, Jeff Garzik wrote: > So, can people give this a test? It includes a change that, I hope, > addresses Russell's problem, as well as a patch from Rask.
I have attached a patch which fixes two problems I found during compilation: 1) de_open() no longer uses the flags variable because the spinlocking is gone, but I forgot to remove the variable. 2) __de_set_settings() now references dev which is undefined.
The patch should be applied on top of your patch, Jeff.
-- Regards, Rask Ingemann Lambertsen --- linux-2.6.0-test8/drivers/net/tulip/de2104x.c-orig Tue Nov 25 13:20:25 2003 +++ linux-2.6.0-test8/drivers/net/tulip/de2104x.c Tue Nov 25 13:20:25 2003 @@ -1384,7 +1384,6 @@ static int de_open (struct net_device *d { struct de_private *de = dev->priv; int rc; - unsigned long flags; if (netif_msg_ifup(de)) printk(KERN_DEBUG "%s: enabling interface\n", dev->name); @@ -1601,7 +1600,7 @@ static int __de_set_settings(struct de_p (ecmd->advertising == de->media_advertise)) return 0; /* nothing to change */ - if (netif_running(dev)) { + if (netif_running(de->dev)) { de_link_down(de); de_stop_rxtx(de); } @@ -1610,7 +1609,7 @@ static int __de_set_settings(struct de_p de->media_lock = media_lock; de->media_advertise = ecmd->advertising; - if (netif_running(dev)) + if (netif_running(de->dev)) de_set_media(de); return 0; | |