patch-2.4.22 linux-2.4.22/drivers/net/acenic.c

Next file: linux-2.4.22/drivers/net/amd8111e.c
Previous file: linux-2.4.22/drivers/net/Makefile.lib
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/drivers/net/acenic.c linux-2.4.22/drivers/net/acenic.c
@@ -1865,7 +1865,9 @@
 	} else {
 		printk(KERN_DEBUG "%s: BUG... transmitter died. Kicking it.\n",
 		       dev->name);
+#if 0
 		netif_wake_queue(dev);
+#endif
 	}
 }
 
@@ -3017,9 +3019,6 @@
 		return 0;
 
 	case ETHTOOL_SSET:
-		if(!capable(CAP_NET_ADMIN))
-			return -EPERM;
-
 		link = readl(&regs->GigLnkState);
 		if (link & LNK_1000MB)
 			speed = SPEED_1000;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)