patch-2.2.15 linux/drivers/net/dgrs.c

• Lines: 21
• Date: Fri Apr 21 12:46:16 2000
• Orig file: v2.2.14/drivers/net/dgrs.c
• Orig date: Tue Dec 29 19:32:06 1998

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/net/dgrs.c linux/drivers/net/dgrs.c
@@ -861,6 +861,8 @@
 				return -EFAULT;
 			return (0);
 		case DGRS_SETFILTER:
+			if (!suser())
+				return -EPERM;
 			if (ioc.port > privN->bcomm->bc_nports)
 				return -EINVAL;
 			if (ioc.filter >= NFILTERS)
@@ -1197,8 +1199,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",