diff options
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 | ||||
| -rw-r--r-- | net/ipv4/udp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 744bc9d6cebc..0ba6e911c979 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -2050,7 +2050,7 @@ static void *established_get_first(struct seq_file *seq) | |||
| 2050 | st->state = TCP_SEQ_STATE_TIME_WAIT; | 2050 | st->state = TCP_SEQ_STATE_TIME_WAIT; |
| 2051 | inet_twsk_for_each(tw, node, | 2051 | inet_twsk_for_each(tw, node, |
| 2052 | &tcp_hashinfo.ehash[st->bucket].twchain) { | 2052 | &tcp_hashinfo.ehash[st->bucket].twchain) { |
| 2053 | if (tw->tw_family != st->family && | 2053 | if (tw->tw_family != st->family || |
| 2054 | tw->tw_net != net) { | 2054 | tw->tw_net != net) { |
| 2055 | continue; | 2055 | continue; |
| 2056 | } | 2056 | } |
| @@ -2078,7 +2078,7 @@ static void *established_get_next(struct seq_file *seq, void *cur) | |||
| 2078 | tw = cur; | 2078 | tw = cur; |
| 2079 | tw = tw_next(tw); | 2079 | tw = tw_next(tw); |
| 2080 | get_tw: | 2080 | get_tw: |
| 2081 | while (tw && tw->tw_family != st->family && tw->tw_net != net) { | 2081 | while (tw && (tw->tw_family != st->family || tw->tw_net != net)) { |
| 2082 | tw = tw_next(tw); | 2082 | tw = tw_next(tw); |
| 2083 | } | 2083 | } |
| 2084 | if (tw) { | 2084 | if (tw) { |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index a98c43c0a89c..fa946829d1e8 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -1537,7 +1537,7 @@ static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk) | |||
| 1537 | sk = sk_next(sk); | 1537 | sk = sk_next(sk); |
| 1538 | try_again: | 1538 | try_again: |
| 1539 | ; | 1539 | ; |
| 1540 | } while (sk && sk->sk_net != net && sk->sk_family != state->family); | 1540 | } while (sk && (sk->sk_net != net || sk->sk_family != state->family)); |
| 1541 | 1541 | ||
| 1542 | if (!sk && ++state->bucket < UDP_HTABLE_SIZE) { | 1542 | if (!sk && ++state->bucket < UDP_HTABLE_SIZE) { |
| 1543 | sk = sk_head(state->hashtable + state->bucket); | 1543 | sk = sk_head(state->hashtable + state->bucket); |
