aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv6/tcp_ipv6.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 2bb87b852125..ffd5fa8bdb15 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -164,12 +164,12 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
164 * connect() to INADDR_ANY means loopback (BSD'ism). 164 * connect() to INADDR_ANY means loopback (BSD'ism).
165 */ 165 */
166 166
167 if(ipv6_addr_any(&usin->sin6_addr)) 167 if (ipv6_addr_any(&usin->sin6_addr))
168 usin->sin6_addr.s6_addr[15] = 0x1; 168 usin->sin6_addr.s6_addr[15] = 0x1;
169 169
170 addr_type = ipv6_addr_type(&usin->sin6_addr); 170 addr_type = ipv6_addr_type(&usin->sin6_addr);
171 171
172 if(addr_type & IPV6_ADDR_MULTICAST) 172 if (addr_type & IPV6_ADDR_MULTICAST)
173 return -ENETUNREACH; 173 return -ENETUNREACH;
174 174
175 if (addr_type&IPV6_ADDR_LINKLOCAL) { 175 if (addr_type&IPV6_ADDR_LINKLOCAL) {
@@ -336,7 +336,7 @@ static void tcp_v6_mtu_reduced(struct sock *sk)
336static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 336static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
337 u8 type, u8 code, int offset, __be32 info) 337 u8 type, u8 code, int offset, __be32 info)
338{ 338{
339 const struct ipv6hdr *hdr = (const struct ipv6hdr*)skb->data; 339 const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data;
340 const struct tcphdr *th = (struct tcphdr *)(skb->data+offset); 340 const struct tcphdr *th = (struct tcphdr *)(skb->data+offset);
341 struct ipv6_pinfo *np; 341 struct ipv6_pinfo *np;
342 struct sock *sk; 342 struct sock *sk;
@@ -469,7 +469,7 @@ static int tcp_v6_send_synack(struct sock *sk, struct dst_entry *dst,
469{ 469{
470 struct inet_request_sock *ireq = inet_rsk(req); 470 struct inet_request_sock *ireq = inet_rsk(req);
471 struct ipv6_pinfo *np = inet6_sk(sk); 471 struct ipv6_pinfo *np = inet6_sk(sk);
472 struct sk_buff * skb; 472 struct sk_buff *skb;
473 int err = -ENOMEM; 473 int err = -ENOMEM;
474 474
475 /* First, grab a route. */ 475 /* First, grab a route. */
@@ -912,7 +912,7 @@ static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
912} 912}
913 913
914 914
915static struct sock *tcp_v6_hnd_req(struct sock *sk,struct sk_buff *skb) 915static struct sock *tcp_v6_hnd_req(struct sock *sk, struct sk_buff *skb)
916{ 916{
917 struct request_sock *req, **prev; 917 struct request_sock *req, **prev;
918 const struct tcphdr *th = tcp_hdr(skb); 918 const struct tcphdr *th = tcp_hdr(skb);
@@ -1085,9 +1085,9 @@ drop:
1085 return 0; /* don't send reset */ 1085 return 0; /* don't send reset */
1086} 1086}
1087 1087
1088static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, 1088static struct sock *tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
1089 struct request_sock *req, 1089 struct request_sock *req,
1090 struct dst_entry *dst) 1090 struct dst_entry *dst)
1091{ 1091{
1092 struct inet_request_sock *ireq; 1092 struct inet_request_sock *ireq;
1093 struct ipv6_pinfo *newnp, *np = inet6_sk(sk); 1093 struct ipv6_pinfo *newnp, *np = inet6_sk(sk);
@@ -1382,7 +1382,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
1382 * otherwise we just shortcircuit this and continue with 1382 * otherwise we just shortcircuit this and continue with
1383 * the new socket.. 1383 * the new socket..
1384 */ 1384 */
1385 if(nsk != sk) { 1385 if (nsk != sk) {
1386 sock_rps_save_rxhash(nsk, skb); 1386 sock_rps_save_rxhash(nsk, skb);
1387 if (tcp_child_process(sk, nsk, skb)) 1387 if (tcp_child_process(sk, nsk, skb))
1388 goto reset; 1388 goto reset;
@@ -1742,7 +1742,7 @@ static void get_openreq6(struct seq_file *seq,
1742 dest->s6_addr32[2], dest->s6_addr32[3], 1742 dest->s6_addr32[2], dest->s6_addr32[3],
1743 ntohs(inet_rsk(req)->ir_rmt_port), 1743 ntohs(inet_rsk(req)->ir_rmt_port),
1744 TCP_SYN_RECV, 1744 TCP_SYN_RECV,
1745 0,0, /* could print option size, but that is af dependent. */ 1745 0, 0, /* could print option size, but that is af dependent. */
1746 1, /* timers active (only the expire timer) */ 1746 1, /* timers active (only the expire timer) */
1747 jiffies_to_clock_t(ttd), 1747 jiffies_to_clock_t(ttd),
1748 req->num_timeout, 1748 req->num_timeout,
@@ -1801,7 +1801,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
1801 atomic_read(&sp->sk_refcnt), sp, 1801 atomic_read(&sp->sk_refcnt), sp,
1802 jiffies_to_clock_t(icsk->icsk_rto), 1802 jiffies_to_clock_t(icsk->icsk_rto),
1803 jiffies_to_clock_t(icsk->icsk_ack.ato), 1803 jiffies_to_clock_t(icsk->icsk_ack.ato),
1804 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong, 1804 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
1805 tp->snd_cwnd, 1805 tp->snd_cwnd,
1806 tcp_in_initial_slowstart(tp) ? -1 : tp->snd_ssthresh 1806 tcp_in_initial_slowstart(tp) ? -1 : tp->snd_ssthresh
1807 ); 1807 );