patch-2.2.19 linux/drivers/net/sunhme.c

• Lines: 44
• Date: Sun Mar 25 11:37:35 2001
• Orig file: v2.2.18/drivers/net/sunhme.c
• Orig date: Sun Mar 25 11:12:51 2001

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.18/drivers/net/sunhme.c linux/drivers/net/sunhme.c
@@ -3523,6 +3523,7 @@
 	struct linux_sbus_device *sdev = 0;
 	static int called = 0;
 	int cards = 0, v;
+	char model[128];
 
 	if(called)
 		return ENODEV;
@@ -3534,7 +3535,13 @@
 				dev = NULL;
 			if(!strcmp(sdev->prom_name, "SUNW,hme")) {
 				cards++;
-				if((v = happy_meal_ether_init(dev, sdev, 0)))
+				prom_getstring(sdev->prom_node, "model",
+					       model, sizeof(model));
+				if (!strcmp(model, "SUNW,sbus-qfe"))
+					v = happy_meal_ether_init(dev, sdev, 1);
+				else
+					v = happy_meal_ether_init(dev, sdev, 0);
+				if(v)
 					return v;
 			} else if(!strcmp(sdev->prom_name, "qfe") ||
 				  !strcmp(sdev->prom_name, "SUNW,qfe")) {
@@ -3582,11 +3589,20 @@
 cleanup_module(void)
 {
 	struct happy_meal *sunshine;
+	struct quattro *last_seen_qfe = NULL;
 
 	/* No need to check MOD_IN_USE, as sys_delete_module() checks. */
 	while (root_happy_dev) {
 		struct happy_meal *hp = root_happy_dev;
 		sunshine = root_happy_dev->next_module;
+
+		if (!(hp->happy_flags & HFLAG_PCI) &&
+		    (hp->happy_flags & HFLAG_QUATTRO)) {
+			if (hp->qfe_parent != last_seen_qfe) {
+				free_irq(hp->dev->irq, hp->qfe_parent);
+				last_seen_qfe = hp->qfe_parent;
+			}
+		}
 
 		sparc_free_io(hp->gregs, sizeof(struct hmeal_gregs));
 		sparc_free_io(hp->etxregs, sizeof(struct hmeal_etxregs));