aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-09-27 02:20:08 -0400
committerDavid S. Miller <davem@davemloft.net>2011-09-27 02:20:08 -0400
commitb82d1bb4fd206ed305f9e955eeffc4a678149442 (patch)
treeb0790dcc52f9b070e0b646eb6c0b7a16ac8c4a1a /net/ipv6
parent3f192795cf1a0098df7bd655f7a72eee26bd63c3 (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/ipv6')
-rw-r--r--net/ipv6/tcp_ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 12bdb9af96e5..00797d857667 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1717,7 +1717,7 @@ static int tcp_v6_rcv(struct sk_buff *skb)
1717 skb->len - th->doff*4); 1717 skb->len - th->doff*4);
1718 TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); 1718 TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq);
1719 TCP_SKB_CB(skb)->when = 0; 1719 TCP_SKB_CB(skb)->when = 0;
1720 TCP_SKB_CB(skb)->flags = ipv6_get_dsfield(hdr); 1720 TCP_SKB_CB(skb)->ip_dsfield = ipv6_get_dsfield(hdr);
1721 TCP_SKB_CB(skb)->sacked = 0; 1721 TCP_SKB_CB(skb)->sacked = 0;
1722 1722
1723 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); 1723 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);