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

• Lines: 29
• Date: Mon Mar 13 09:50:16 2000
• Orig file: v2.3.51/linux/drivers/net/rrunner.c
• Orig date: Thu Mar 2 14:36:22 2000

diff -u --recursive --new-file v2.3.51/linux/drivers/net/rrunner.c linux/drivers/net/rrunner.c
@@ -76,8 +76,8 @@
 #else
 #define NET_BH              0
 #define rr_mark_net_bh(foo) {do{} while(0);}
-#define rr_if_busy(dev)     test_bit(LINK_STATE_XOFF, &dev->state)
-#define rr_if_running(dev)  test_bit(LINK_STATE_START, &dev->state)
+#define rr_if_busy(dev)     netif_queue_stopped(dev)
+#define rr_if_running(dev)  netif_running(dev)
 #define rr_if_down(dev)     {do{} while(0);}
 #endif
 
@@ -1550,7 +1550,7 @@
 
 	switch(cmd){
 	case SIOCRRGFW:
-		if (!suser()){
+		if (!capable(CAP_SYS_RAWIO)){
 			error = -EPERM;
 			goto out;
 		}
@@ -1582,7 +1582,7 @@
 		kfree(image);
 		break;
 	case SIOCRRPFW:
-		if (!suser()){
+		if (!capable(CAP_SYS_RAWIO)){
 			error = -EPERM;
 			goto out;
 		}