Attachment 89540 Details for Bug 82507 – Quick patch to add names= parameter.

[patch] Quick patch to add names= parameter.

ori.patch (text/plain), 1.79 KB, created by Aleksey Nogin on 2003-01-23 04:11:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleksey Nogin

Created: 2003-01-23 04:11:45 UTC

Size: 1.79 KB

patch

obsolete

>--- orinoco_cs.c.orig	2002-08-02 17:39:44.000000000 -0700
>+++ orinoco_cs.c	2003-01-22 20:02:27.000000000 -0800
>@@ -67,11 +67,15 @@
> /* Some D-Link cards have buggy CIS. They do work at 5v properly, but
>  * don't have any CIS entry for it. This workaround it... */
> static int ignore_cis_vcc; /* = 0 */
>+/* Interface names to use */
>+static char names[4][IFNAMSIZ];
>+static int name_taken[4]={0,0,0,0};
> 
> MODULE_PARM(irq_mask, "i");
> MODULE_PARM(irq_list, "1-4i");
> MODULE_PARM(reset_cor, "i");
> MODULE_PARM(ignore_cis_vcc, "i");
>+MODULE_PARM(names, "1-4c" __MODULE_STRING(IFNAMSIZ));
> 
> /* Pcmcia specific structure */
> struct orinoco_pccard {
>@@ -336,6 +340,14 @@
> 	link->conf.Attributes = 0;
> 	link->conf.IntType = INT_MEMORY_AND_IO;
> 
>+	/* Use the supplied name */
>+	for(i = 0; i < 4 && name_taken[i]; i++);
>+	if (i < 4) {
>+		name_taken[i]=1;
>+		memcpy(priv->ndev->name, names[i], IFNAMSIZ);
>+	} else
>+		priv->ndev->name[0]='\0';
>+
> 	/* Register with Card Services */
> 	link->next = dev_list;
> 	dev_list = link;
>@@ -374,6 +386,7 @@
> 	dev_link_t **linkp;
> 	struct orinoco_private *priv = link->priv;
> 	struct net_device *dev = priv->ndev;
>+	int i;
> 
> 	TRACE_ENTER("orinoco");
> 
>@@ -403,6 +416,13 @@
> 	if (link->handle)
> 		CardServices(DeregisterClient, link->handle);
> 
>+	for (i = 0; i < 4; i++) {
>+		if (!strcmp(names[i],dev->name)) {
>+			name_taken[i]=0;
>+			break;
>+		}
>+	}
>+
> 	/* Unlink device structure, and free it */
> 	*linkp = link->next;
> 	DEBUG(0, "orinoco_cs: detach: link=%p link->dev=%p\n", link, link->dev);
>@@ -618,8 +638,6 @@
> 	ndev->base_addr = link->io.BasePort1;
> 	ndev->irq = link->irq.AssignedIRQ;
> 
>-	/* register_netdev will give us an ethX name */
>-	ndev->name[0] = '\0';
> 	/* Tell the stack we exist */
> 	if (register_netdev(ndev) != 0) {
> 		printk(KERN_ERR "orinoco_cs: register_netdev() failed\n");

Actions: View | Diff

Attachments on bug 82507: 89540