|
@@ -949,7 +949,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
|
|
|
struct flowi fl;
|
|
|
struct net *net = dev_net(skb->dst->dev);
|
|
|
struct sock *ctl_sk = net->ipv6.tcp_sk;
|
|
|
- unsigned int tot_len = sizeof(*th);
|
|
|
+ unsigned int tot_len = sizeof(struct tcphdr);
|
|
|
#ifdef CONFIG_TCP_MD5SIG
|
|
|
struct tcp_md5sig_key *key;
|
|
|
#endif
|
|
@@ -1033,7 +1033,6 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
|
|
|
* namespace
|
|
|
*/
|
|
|
if (!ip6_dst_lookup(ctl_sk, &buff->dst, &fl)) {
|
|
|
-
|
|
|
if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {
|
|
|
ip6_xmit(ctl_sk, buff, &fl, NULL, 0);
|
|
|
TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
|
|
@@ -1070,13 +1069,13 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32
|
|
|
|
|
|
skb_reserve(buff, MAX_HEADER + sizeof(struct ipv6hdr) + tot_len);
|
|
|
|
|
|
- t1 = (struct tcphdr *) skb_push(buff,tot_len);
|
|
|
+ t1 = (struct tcphdr *) skb_push(buff, tot_len);
|
|
|
|
|
|
/* Swap the send and the receive. */
|
|
|
memset(t1, 0, sizeof(*t1));
|
|
|
t1->dest = th->source;
|
|
|
t1->source = th->dest;
|
|
|
- t1->doff = tot_len/4;
|
|
|
+ t1->doff = tot_len / 4;
|
|
|
t1->seq = htonl(seq);
|
|
|
t1->ack_seq = htonl(ack);
|
|
|
t1->ack = 1;
|