Patchwork via-velocity: earlier name allocation

login
register
mail settings
Submitter Sven Hartge
Date Oct. 22, 2008, 11:24 p.m.
Message ID <alpine.DEB.2.00.0810230114180.17076@ds9.feds.ath.cx>
Download mbox | patch
Permalink /patch/5397/
State Rejected
Delegated to: Jeff Garzik
Headers show

Comments

Sven Hartge - Oct. 22, 2008, 11:24 p.m.
Hi.

This is my first attempt at a kernel patch ever, so please be gentle :)
(And please CC me, as I am not subscribed to netdev.)

This patch corrects a cosmetic bug in the via-velocity driver which 
bothered me for some time.

The messages printed during device init look like the following:

[    8.486422] eth%d: set value of parameter Wake On Lan options to 0
                  ^^!
[    8.487340] eth0: VIA Networking Velocity Family Gigabit Ethernet Adapter

Note the unresolved format string.

I just copied and adapted the name allocation code from register_netdev 
and call it before the first use of dev->name 

Even if my attempt is incorrect, it should give you an idea what needs 
fixing here.

Signed-off-by: Sven Hartge <sven@svenhartge.de>



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
stephen hemminger - Oct. 23, 2008, 12:04 a.m.
On Thu, 23 Oct 2008 01:24:25 +0200 (CEST)
Sven Hartge <sven@svenhartge.de> wrote:

> Hi.
> 
> This is my first attempt at a kernel patch ever, so please be gentle :)
> (And please CC me, as I am not subscribed to netdev.)
> 
> This patch corrects a cosmetic bug in the via-velocity driver which 
> bothered me for some time.
> 
> The messages printed during device init look like the following:
> 
> [    8.486422] eth%d: set value of parameter Wake On Lan options to 0
>                   ^^!
> [    8.487340] eth0: VIA Networking Velocity Family Gigabit Ethernet Adapter
> 
> Note the unresolved format string.
> 
> I just copied and adapted the name allocation code from register_netdev 
> and call it before the first use of dev->name 
> 
> Even if my attempt is incorrect, it should give you an idea what needs 
> fixing here.
> 
> Signed-off-by: Sven Hartge <sven@svenhartge.de>
> 
> diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
> index 2dced38..15f2c19 100644
> --- a/drivers/net/via-velocity.c
> +++ b/drivers/net/via-velocity.c
> @@ -934,6 +934,16 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
>  	for (i = 0; i < 6; i++)
>  		dev->dev_addr[i] = readb(&regs->PAR[i]);
>  
> +	/*
> +	 *  Do name allocation.
> +	 */
> +
> +	if (strchr(dev->name, '%')) {
> +		ret = dev_alloc_name(dev, dev->name);
> +			if (ret < 0)
> +				dev_err(&pdev->dev, "Name allocation failed.\n");
> +				goto err_disable;
> +	}
>  
>  	velocity_get_options(&vptr->options, velocity_nics, dev->name);
>  

NAK

There is nothing to prevent that device name from being allocated by another device
at that point.  The correct fix is to not use dev->name until after registering
the network device.  Change the order of registration or pass dev_driver_string(&pdev->dev)
instead of dev->name to velocity_get_options
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sven Hartge - Oct. 23, 2008, 7:29 a.m.
Stephen Hemminger wrote:


> NAK
> 
> There is nothing to prevent that device name from being allocated by another device
> at that point.  The correct fix is to not use dev->name until after registering
> the network device.  Change the order of registration or pass dev_driver_string(&pdev->dev)
> instead of dev->name to velocity_get_options

Fine with me. This was just the hint I was looking for. If you don't
mind, I will mail a new patch for this case later.

S°

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 2dced38..15f2c19 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -934,6 +934,16 @@  static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
 	for (i = 0; i < 6; i++)
 		dev->dev_addr[i] = readb(&regs->PAR[i]);
 
+	/*
+	 *  Do name allocation.
+	 */
+
+	if (strchr(dev->name, '%')) {
+		ret = dev_alloc_name(dev, dev->name);
+			if (ret < 0)
+				dev_err(&pdev->dev, "Name allocation failed.\n");
+				goto err_disable;
+	}
 
 	velocity_get_options(&vptr->options, velocity_nics, dev->name);