patch-2.3.99-pre1 linux/drivers/net/dgrs.c

• Lines: 21
• Date: Sun Mar 12 19:18:55 2000
• Orig file: v2.3.51/linux/drivers/net/dgrs.c
• Orig date: Thu Feb 10 17:11:10 2000

diff -u --recursive --new-file v2.3.51/linux/drivers/net/dgrs.c linux/drivers/net/dgrs.c
@@ -852,6 +852,8 @@
 				return -EFAULT;
 			return (0);
 		case DGRS_SETFILTER:
+			if (!capable(CAP_NET_ADMIN))
+				return -EPERM;
 			if (ioc.port > privN->bcomm->bc_nports)
 				return -EINVAL;
 			if (ioc.filter >= NFILTERS)
@@ -1188,8 +1190,11 @@
 
 	priv->intrcnt = 0;
 	for (i = jiffies + 2*HZ + HZ/2; time_after(i, jiffies); )
+	{
+		barrier();		/* gcc 2.95 needs this */
 		if (priv->intrcnt >= 2)
 			break;
+	}
 	if (priv->intrcnt < 2)
 	{
 		printk("%s: Not interrupting on IRQ %d (%d)\n",