Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aa956d8 authored by Wang Yufen's avatar Wang Yufen Committed by David S. Miller
Browse files

ipv6: tcp_ipv6 do some cleanup 



Signed-off-by: default avatarWang Yufen <wangyufen@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 788367fd

net/ipv6/tcp_ipv6.c

+11 −13
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <linux/ipsec.h>

#include <linux/times.h>

#include <linux/slab.h>



#include <linux/uaccess.h>

#include <linux/ipv6.h>

#include <linux/icmpv6.h>

#include <linux/random.h>
@@ -65,8 +65,6 @@ 
#include <net/tcp_memcontrol.h>

#include <net/busy_poll.h>



#include <asm/uaccess.h>



#include <linux/proc_fs.h>

#include <linux/seq_file.h>
@@ -1261,7 +1259,8 @@ static struct sock *tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 


#ifdef CONFIG_TCP_MD5SIG

	/* Copy over the MD5 key from the original socket */

	if ((key = tcp_v6_md5_do_lookup(sk, &newsk->sk_v6_daddr)) != NULL) {

	key = tcp_v6_md5_do_lookup(sk, &newsk->sk_v6_daddr);

	if (key != NULL) {

		/* We're using one, so create a matching key

		 * on the newsk structure. If we fail to get

		 * memory, then we end up not copying the key
@@ -1305,9 +1304,8 @@ static __sum16 tcp_v6_checksum_init(struct sk_buff *skb) 
					      &ipv6_hdr(skb)->saddr,

					      &ipv6_hdr(skb)->daddr, 0));



	if (skb->len <= 76) {

	if (skb->len <= 76)

		return __skb_checksum_complete(skb);

	}

	return 0;

}
@@ -1604,7 +1602,8 @@ do_time_wait: 
		break;

	case TCP_TW_RST:

		goto no_tcp_socket;

	case TCP_TW_SUCCESS:;

	case TCP_TW_SUCCESS:

		;

	}

	goto discard_it;

}
@@ -1683,7 +1682,6 @@ static const struct tcp_sock_af_ops tcp_sock_ipv6_specific = { 
/*

 *	TCP over IPv4 via INET6 API

 */



static const struct inet_connection_sock_af_ops ipv6_mapped = {

	.queue_xmit	   = ip_queue_xmit,

	.send_check	   = tcp_v4_send_check,