---

yaml --- r: 85635 b: refs/heads/master c: e4f8b5d h: refs/heads/master i: 85633: e4d161c 85631: 603f8bf v: v3
git-mirror · Feb 13, 2008 · 5c9a24e · 5c9a24e
1 parent 7bc6c0e
commit 5c9a24e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b791dd3ed7bef989f268365e85800862e8ac756f
+refs/heads/master: e4f8b5d4edc1edb0709531bd1a342655d5e8b98e
diff --git a/trunk/net/ipv4/ip_sockglue.c b/trunk/net/ipv4/ip_sockglue.c
@@ -514,11 +514,6 @@ static int do_ip_setsockopt(struct sock *sk, int level,
 			val &= ~3;
 			val |= inet->tos & 3;
 		}
-		if (IPTOS_PREC(val) >= IPTOS_PREC_CRITIC_ECP &&
-		    !capable(CAP_NET_ADMIN)) {
-			err = -EPERM;
-			break;
-		}
 		if (inet->tos != val) {
 			inet->tos = val;
 			sk->sk_priority = rt_tos2priority(val);