diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-06 02:57:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-06 03:19:22 +0200 |
| commit | 53954cf8c5d205624167a2bfd117cc0c1a5f3c6d (patch) | |
| tree | a287f0c80eb616758bb5212523c8fb3d8fc350a4 /net/ipv4/inetpeer.c | |
| parent | Merge branch 'bpftool' (diff) | |
| parent | Merge tag 'pm-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa... (diff) | |
| download | linux-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.tar.xz linux-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inetpeer.c')
| -rw-r--r-- | net/ipv4/inetpeer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index 6e5626cc366c..914d56928578 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c @@ -128,9 +128,9 @@ static struct inet_peer *lookup(const struct inetpeer_addr *daddr, break; } if (cmp == -1) - pp = &(*pp)->rb_left; + pp = &next->rb_left; else - pp = &(*pp)->rb_right; + pp = &next->rb_right; } *parent_p = parent; *pp_p = pp; |