From e26de6afa3f4ddb7675f41fcc84725079fbae70f Mon Sep 17 00:00:00 2001
From: Jean Tourrilhes <jt@hpl.hp.com>
Date: Tue, 4 Apr 2006 15:53:43 -0700
Subject: [PATCH] --- yaml --- r: 26081 b: refs/heads/master c:
 a417016d1a07e6df0621dbb2926da82642eca823 h: refs/heads/master i:   26079:
 a4bfeb340bef6315b6145d2d699e3347377495c4 v: v3

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

diff --git a/[refs] b/[refs]
index 631125cc799c..3722ad4b3258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a1af6ffe4941497071125d3a8bb3e1feee45df1
+refs/heads/master: a417016d1a07e6df0621dbb2926da82642eca823
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 83231a27ae02..3bad1afc89fa 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2698,7 +2698,8 @@ int dev_ioctl(unsigned int cmd, void __user *arg)
 				/* If command is `set a parameter', or
 				 * `get the encoding parameters', check if
 				 * the user has the right to do it */
-				if (IW_IS_SET(cmd) || cmd == SIOCGIWENCODE) {
+				if (IW_IS_SET(cmd) || cmd == SIOCGIWENCODE
+				    || cmd == SIOCGIWENCODEEXT) {
 					if (!capable(CAP_NET_ADMIN))
 						return -EPERM;
 				}