diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-10-27 06:44:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-27 06:44:35 +0200 |
| commit | b903d324bee2627036d024dceed73b3c96558795 (patch) | |
| tree | 976d7f5ff6d765faca2e1af86cbcddc9257470ab /net/ipv6/ip6_output.c | |
| parent | Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-b903d324bee2627036d024dceed73b3c96558795.tar.xz linux-b903d324bee2627036d024dceed73b3c96558795.zip | |
ipv6: tcp: fix TCLASS value in ACK messages sent from TIME_WAIT
commit 66b13d99d96a (ipv4: tcp: fix TOS value in ACK messages sent from
TIME_WAIT) fixed IPv4 only.
This part is for the IPv6 side, adding a tclass param to ip6_xmit()
We alias tw_tclass and tw_tos, if socket family is INET6.
[ if sockets is ipv4-mapped, only IP_TOS socket option is used to fill
TOS field, TCLASS is not taken into account ]
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 1c9bf8b5c30a..ff300474bee7 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -180,7 +180,7 @@ int ip6_output(struct sk_buff *skb) */ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, - struct ipv6_txoptions *opt) + struct ipv6_txoptions *opt, int tclass) { struct net *net = sock_net(sk); struct ipv6_pinfo *np = inet6_sk(sk); @@ -190,7 +190,6 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, u8 proto = fl6->flowi6_proto; int seg_len = skb->len; int hlimit = -1; - int tclass = 0; u32 mtu; if (opt) { @@ -228,10 +227,8 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, /* * Fill in the IPv6 header */ - if (np) { - tclass = np->tclass; + if (np) hlimit = np->hop_limit; - } if (hlimit < 0) hlimit = ip6_dst_hoplimit(dst); |