[PATCH 2.6.0-test4][NET] 3c509.c: remove device.name field

[PATCH 2.6.0-test4][NET] 3c509.c: remove device.name field

[Vinay K Nallamothu]

Hi,

This patch removes the device name field which is no longer present.


--- linux-2.6.0-test4/drivers/net/3c509.c	2003-08-23 13:14:30.000000000 +0530
+++ linux-2.6.0-test4-nvk/drivers/net/3c509.c	2003-08-23 18:34:35.000000000 +0530
@@ -629,8 +629,6 @@
 			   el3_mca_adapter_names[mdev->index], slot + 1);
 
 		/* claim the slot */
-		strncpy(device->name, el3_mca_adapter_names[mdev->index],
-				sizeof(device->name));
 		mca_device_set_claim(mdev, 1);
 
 		if_port = pos4 & 0x03;

Re: [PATCH 2.6.0-test4][NET] 3c509.c: remove device.name field

[David S. Miller]

On 23 Aug 2003 18:43:29 +0530
Vinay K Nallamothu <vinay-rc@naturesoft.net> wrote:

> This patch removes the device name field which is no longer present.

This doesn't look like the right fix.  You can't just
delete these lines, you should rather replace them with
accesses to whatever the MCA device struct name field is.

Re: [PATCH 2.6.0-test4][NET] 3c509.c: remove device.name field

[Vinay K Nallamothu]

Hi Dave,

On Sun, 2003-08-24 at 16:17, David S. Miller wrote:
> On 23 Aug 2003 18:43:29 +0530
> Vinay K Nallamothu <vinay-rc@naturesoft.net> wrote:
> 
> > This patch removes the device name field which is no longer present.
> 
> This doesn't look like the right fix.  You can't just
> delete these lines, you should rather replace them with
> accesses to whatever the MCA device struct name field is.
> 
> 
Pls find the updated patch (hopefully right this time) below:

Thanks
vinay

--- linux-2.6.0-test4/drivers/net/3c509.c	2003-08-23 13:14:30.000000000 +0530
+++ linux-2.6.0-test4-nvk/drivers/net/3c509.c	2003-08-24 17:51:19.000000000 +0530
@@ -629,8 +629,8 @@
 			   el3_mca_adapter_names[mdev->index], slot + 1);
 
 		/* claim the slot */
-		strncpy(device->name, el3_mca_adapter_names[mdev->index],
-				sizeof(device->name));
+		strncpy(mdev->name, el3_mca_adapter_names[mdev->index],
+				sizeof(mdev->name));
 		mca_device_set_claim(mdev, 1);
 
 		if_port = pos4 & 0x03;

Re: [PATCH 2.6.0-test4][NET] 3c509.c: remove device.name field

[David S. Miller]

On 24 Aug 2003 17:55:40 +0530
Vinay K Nallamothu <vinay-rc@naturesoft.net> wrote:

> On Sun, 2003-08-24 at 16:17, David S. Miller wrote:
> > On 23 Aug 2003 18:43:29 +0530
> > Vinay K Nallamothu <vinay-rc@naturesoft.net> wrote:
> > 
> > > This patch removes the device name field which is no longer present.
> > 
> > This doesn't look like the right fix.  You can't just
> > delete these lines, you should rather replace them with
> > accesses to whatever the MCA device struct name field is.
> > 
> > 
> Pls find the updated patch (hopefully right this time) below:

Applied, thanks.