From 640331f4d294ac855c9cbb2d92e55e8fee38beff Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Tue, 24 Jan 2006 12:46:33 -0800
Subject: [PATCH] --- yaml --- r: 19047 b: refs/heads/master c:
 cabcac0b296cd9683bc168d60839729b720dc2b7 h: refs/heads/master i:   19045:
 8b63a28bfe6a1a073bb6003d00e18f30633b3b19   19043:
 5183eb998f4469a0761e34e2fdb82202285bd72b   19039:
 f139fd53579f98d02416a82664f779825eba61a9 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a858eabd26dc..ec336ff6e96c 100644
--- 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
index fd070a098f20..ffb82073056e 100644
--- 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);