Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 17446
b: refs/heads/master
c: 7dbf075
h: refs/heads/master
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo authored and David S. Miller committed Jan 9, 2006
1 parent 7e8342f commit db22310
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: a2c2064f7f23fde23e34fb5d07de43b582966b71
refs/heads/master: 7dbf0755249336f44f57368bdbf6f84103b3ba75
6 changes: 3 additions & 3 deletions trunk/net/ipv4/inet_diag.c
Original file line number Diff line number Diff line change
Expand Up @@ -697,14 +697,14 @@ static int inet_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (r->idiag_states & TCPF_TIME_WAIT) {
sk_for_each(sk, node,
&hashinfo->ehash[i + hashinfo->ehash_size].chain) {
struct inet_sock *inet = inet_sk(sk);
const struct inet_timewait_sock *tw = inet_twsk(sk);

if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != inet->sport &&
if (r->id.idiag_sport != tw->tw_sport &&
r->id.idiag_sport)
goto next_dying;
if (r->id.idiag_dport != inet->dport &&
if (r->id.idiag_dport != tw->tw_dport &&
r->id.idiag_dport)
goto next_dying;
if (inet_diag_dump_sock(skb, sk, cb) < 0) {
Expand Down

0 comments on commit db22310

Please sign in to comment.