Attachment 271701 Details for Bug 402071 – additional patch

[patch] additional patch

kudzu-1.2.81-macio-update.patch (text/plain), 2.30 KB, created by David Woodhouse on 2007-11-28 20:23:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-11-28 20:23:38 UTC

Size: 2.30 KB

patch

obsolete

>--- kudzu-1.2.80/macio.c.orig	2007-11-28 17:07:57.000000000 +0000
>+++ kudzu-1.2.80/macio.c	2007-11-28 17:17:42.000000000 +0000
>@@ -98,6 +98,44 @@ static void free_find_results(struct fin
> 	}	
> }
> 
>+static void find_of_netdev(struct macioDevice *netdev, char *path)
>+{
>+	char buf[256];
>+	struct dirent **namelist;
>+	struct stat statbuf;
>+	int n, fd;
>+	size_t sz;
>+
>+	buf[255] = 0;
>+
>+	path += strlen("/proc/device-tree");
>+
>+	n = scandir("/sys/class/net", &namelist, 0, 0);
>+	if (n >= 0) {
>+		while (n--) {
>+			snprintf(buf, 255, "/sys/class/net/%s/device/devspec", namelist[n]->d_name);
>+			fd = open(buf, O_RDONLY);
>+			if (fd >= 0) {
>+				sz = read(fd, buf, 255);
>+				if (sz >= 0) {
>+					buf[sz] = 0;
>+					if (!strcmp(buf, path)) {
>+						netdev->device = strdup(namelist[n]->d_name);
>+						__getNetworkAddr((struct device *)netdev, netdev->device);
>+						while (n--)
>+							free(namelist[n]);
>+						return;
>+					}
>+				}
>+			}
>+			free(namelist[n]);
>+		}
>+	}
>+
>+	netdev->device = strdup("eth");
>+}
>+
>+
> /* given a class to probe, returns an array macio devices found which match */
> /* all entries are malloc'd, so caller must free when done. Use          */
> /* dev->freeDevice(dev) to free individual macioDevice's, since they 	 */
>@@ -146,7 +184,7 @@ struct device *macioProbe( enum deviceCl
> 		if (list.result) {
> 			netdev = macioNewDevice(NULL);
> 			netdev->type = CLASS_NETWORK;
>-			netdev->device = strdup("eth");
>+			find_of_netdev(netdev, n->path);
> 			netdev->desc = strdup("Apple Computer Inc.|Airport");
> 			netdev->driver = strdup("airport");
> 			netdev->next = devlist;
>@@ -167,7 +205,7 @@ struct device *macioProbe( enum deviceCl
> 
> 			netdev = macioNewDevice(NULL);
> 			netdev->type = CLASS_NETWORK;
>-			netdev->device = strdup("eth");
>+			find_of_netdev(netdev, n->path);
> 			switch(ret) {
> 			case 1:
> 			case 2:
>@@ -191,7 +229,11 @@ struct device *macioProbe( enum deviceCl
> 		if (list.result) {
> 			netdev = macioNewDevice(NULL);
> 			netdev->type = CLASS_NETWORK;
>-			netdev->device = strdup("eth");
>+			__getSysfsDevice((struct device *)netdev, n->path, "net:",0);
>+			if (netdev->device)
>+				__getNetworkAddr((struct device *)netdev, netdev->device);
>+			else
>+				netdev->device = strdup("eth");
> 			netdev->desc = strdup("Marvell|MV643xx Ethernet");
> 			netdev->driver = strdup("mv643xx_eth");
> 			netdev->next = devlist;

Actions: View | Diff

Attachments on bug 402071: 270651 | 271331 | 271701 | 271711