diff options
author | Maciej Żenczykowski <maze@google.com> | 2011-10-22 00:07:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-22 00:07:47 -0400 |
commit | 2c67e9acb65da96ae1b0ba93ec04af7142533bef (patch) | |
tree | b4f6322bdea347f104db4b9cb77da189cc90c37c /net/ipv4/ip_sockglue.c | |
parent | cf533ea53ebfae41be15b103d78e7ebec30b9969 (diff) |
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/ipv4/ip_sockglue.c')
-rw-r--r-- | net/ipv4/ip_sockglue.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index f0dc3ad662ae..09ff51bf16a4 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/netfilter.h> | 33 | #include <linux/netfilter.h> |
34 | #include <linux/route.h> | 34 | #include <linux/route.h> |
35 | #include <linux/mroute.h> | 35 | #include <linux/mroute.h> |
36 | #include <net/inet_ecn.h> | ||
36 | #include <net/route.h> | 37 | #include <net/route.h> |
37 | #include <net/xfrm.h> | 38 | #include <net/xfrm.h> |
38 | #include <net/compat.h> | 39 | #include <net/compat.h> |
@@ -578,8 +579,8 @@ static int do_ip_setsockopt(struct sock *sk, int level, | |||
578 | break; | 579 | break; |
579 | case IP_TOS: /* This sets both TOS and Precedence */ | 580 | case IP_TOS: /* This sets both TOS and Precedence */ |
580 | if (sk->sk_type == SOCK_STREAM) { | 581 | if (sk->sk_type == SOCK_STREAM) { |
581 | val &= ~3; | 582 | val &= ~INET_ECN_MASK; |
582 | val |= inet->tos & 3; | 583 | val |= inet->tos & INET_ECN_MASK; |
583 | } | 584 | } |
584 | if (inet->tos != val) { | 585 | if (inet->tos != val) { |
585 | inet->tos = val; | 586 | inet->tos = val; |