summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2011-10-22 00:07:47 -0400
committerDavid S. Miller <davem@davemloft.net>2011-10-22 00:07:47 -0400
commit2c67e9acb65da96ae1b0ba93ec04af7142533bef (patch)
treeb4f6322bdea347f104db4b9cb77da189cc90c37c /net
parentcf533ea53ebfae41be15b103d78e7ebec30b9969 (diff)
downloadop-kernel-dev-2c67e9acb65da96ae1b0ba93ec04af7142533bef.zip
op-kernel-dev-2c67e9acb65da96ae1b0ba93ec04af7142533bef.tar.gz
net: use INET_ECN_MASK instead of hardcoded 3
Signed-off-by: Maciej Żenczykowski <maze@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_sockglue.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index f0dc3ad..09ff51b 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -33,6 +33,7 @@
#include <linux/netfilter.h>
#include <linux/route.h>
#include <linux/mroute.h>
+#include <net/inet_ecn.h>
#include <net/route.h>
#include <net/xfrm.h>
#include <net/compat.h>
@@ -578,8 +579,8 @@ static int do_ip_setsockopt(struct sock *sk, int level,
break;
case IP_TOS: /* This sets both TOS and Precedence */
if (sk->sk_type == SOCK_STREAM) {
- val &= ~3;
- val |= inet->tos & 3;
+ val &= ~INET_ECN_MASK;
+ val |= inet->tos & INET_ECN_MASK;
}
if (inet->tos != val) {
inet->tos = val;
OpenPOWER on IntegriCloud