Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 349658
b: refs/heads/master
c: 5f1e942
h: refs/heads/master
v: v3
  • Loading branch information
Vijay Subramanian authored and David S. Miller committed Feb 4, 2013
1 parent fb0beba commit e0e9e41
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 848bf15f361c7c22da7998c81d50ed3dffbc827d
refs/heads/master: 5f1e942cb45d06968b0ce94472d97014e0e1fdc9
6 changes: 5 additions & 1 deletion trunk/net/ipv6/tcp_ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
}

inet_csk_reqsk_queue_drop(sk, req, prev);
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
goto out;

case TCP_SYN_SENT:
Expand Down Expand Up @@ -958,8 +959,10 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
goto drop;
}

if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1)
if (sk_acceptq_is_full(sk) && inet_csk_reqsk_queue_young(sk) > 1) {
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENOVERFLOWS);
goto drop;
}

req = inet6_reqsk_alloc(&tcp6_request_sock_ops);
if (req == NULL)
Expand Down Expand Up @@ -1108,6 +1111,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
drop_and_free:
reqsk_free(req);
drop:
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
return 0; /* don't send reset */
}

Expand Down

0 comments on commit e0e9e41

Please sign in to comment.