diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-09-27 02:20:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-27 02:20:08 -0400 |
commit | b82d1bb4fd206ed305f9e955eeffc4a678149442 (patch) | |
tree | b0790dcc52f9b070e0b646eb6c0b7a16ac8c4a1a /net/ipv4/tcp_input.c | |
parent | 3f192795cf1a0098df7bd655f7a72eee26bd63c3 (diff) |
tcp: unalias tcp_skb_cb flags and ip_dsfield
struct tcp_skb_cb contains a "flags" field containing either tcp flags
or IP dsfield depending on context (input or output path)
Introduce ip_dsfield to make the difference clear and ease maintenance.
If later we want to save space, we can union flags/ip_dsfield
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 5a4408c55155..7008fccc164f 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -222,7 +222,7 @@ static inline void TCP_ECN_check_ce(struct tcp_sock *tp, const struct sk_buff *s | |||
222 | if (!(tp->ecn_flags & TCP_ECN_OK)) | 222 | if (!(tp->ecn_flags & TCP_ECN_OK)) |
223 | return; | 223 | return; |
224 | 224 | ||
225 | switch (TCP_SKB_CB(skb)->flags & INET_ECN_MASK) { | 225 | switch (TCP_SKB_CB(skb)->ip_dsfield & INET_ECN_MASK) { |
226 | case INET_ECN_NOT_ECT: | 226 | case INET_ECN_NOT_ECT: |
227 | /* Funny extension: if ECT is not set on a segment, | 227 | /* Funny extension: if ECT is not set on a segment, |
228 | * and we already seen ECT on a previous segment, | 228 | * and we already seen ECT on a previous segment, |