diff options
| author | Eric Dumazet | 2011-09-27 08:20:08 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-09-27 08:20:08 +0200 |
| commit | b82d1bb4fd206ed305f9e955eeffc4a678149442 (patch) | |
| tree | b0790dcc52f9b070e0b646eb6c0b7a16ac8c4a1a /net/ipv6 | |
| parent | enic: Add support for port profile association on a enic SRIOV VF (diff) | |
| download | kernel-qcow2-linux-b82d1bb4fd206ed305f9e955eeffc4a678149442.tar.gz kernel-qcow2-linux-b82d1bb4fd206ed305f9e955eeffc4a678149442.tar.xz kernel-qcow2-linux-b82d1bb4fd206ed305f9e955eeffc4a678149442.zip | |
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.c | 2 |
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) skb->len - th->doff*4); TCP_SKB_CB(skb)->ack_seq = ntohl(th->ack_seq); TCP_SKB_CB(skb)->when = 0; - TCP_SKB_CB(skb)->flags = ipv6_get_dsfield(hdr); + TCP_SKB_CB(skb)->ip_dsfield = ipv6_get_dsfield(hdr); TCP_SKB_CB(skb)->sacked = 0; sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); |