---

yaml --- r: 19047 b: refs/heads/master c: cabcac0 h: refs/heads/master i: 19045: 8b63a28 19043: 5183eb9 19039: f139fd5 v: v3
git-mirror · Jan 24, 2006 · 640331f · 640331f
1 parent 3256fe5
commit 640331f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8798b3fb714477f5c88dde102c149d2b3e1d8def
+refs/heads/master: cabcac0b296cd9683bc168d60839729b720dc2b7
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2543,13 +2543,14 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
 		case SIOCBONDENSLAVE:
 		case SIOCBONDRELEASE:
 		case SIOCBONDSETHWADDR:
-		case SIOCBONDSLAVEINFOQUERY:
-		case SIOCBONDINFOQUERY:
 		case SIOCBONDCHANGEACTIVE:
 		case SIOCBRADDIF:
 		case SIOCBRDELIF:
 			if (!capable(CAP_NET_ADMIN))
 				return -EPERM;
+			/* fall through */
+		case SIOCBONDSLAVEINFOQUERY:
+		case SIOCBONDINFOQUERY:
 			dev_load(ifr.ifr_name);
 			rtnl_lock();
 			ret = dev_ifsioc(&ifr, cmd);