From 5c9a24e3b346b5d9e990ea4958fe95a022a31ab9 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 11 Feb 2008 17:50:30 -0800
Subject: [PATCH] --- yaml --- r: 85635 b: refs/heads/master c:
 e4f8b5d4edc1edb0709531bd1a342655d5e8b98e h: refs/heads/master i:   85633:
 e4d161c2ec3914f32d97755979887d5136c30414   85631:
 603f8bf320ee9ef4292cc79682e58fb4d3483511 v: v3

---
 [refs]                       | 2 +-
 trunk/net/ipv4/ip_sockglue.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 1499c4ef9aa0..0a69697dc1f0 100644
--- 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
index 754b0a5bbfe9..de0572c88859 100644
--- 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);