From 2426a63dc516fe672d906b1bafb5a4e80a6ce8de Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 24 Jan 2011 14:37:46 -0800 Subject: [PATCH] --- yaml --- r: 232451 b: refs/heads/master c: 3408404a4c2a4eead9d73b0bbbfe3f225b65f492 h: refs/heads/master i: 232449: 982477d07b691767dfc59efd6520a81faaa1077e 232447: c9e3efae039dad850c8117e4999ba1bb8fc467e6 v: v3 --- [refs] | 2 +- trunk/net/ipv4/inetpeer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fef32e8a1d88..6286c034ad50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1dc7abf2fafa34b0ffcd070fd59405aa9c0a4d8 +refs/heads/master: 3408404a4c2a4eead9d73b0bbbfe3f225b65f492 diff --git a/trunk/net/ipv4/inetpeer.c b/trunk/net/ipv4/inetpeer.c index d9bc85751c74..a96e65674ac3 100644 --- a/trunk/net/ipv4/inetpeer.c +++ b/trunk/net/ipv4/inetpeer.c @@ -475,7 +475,7 @@ static int cleanup_once(unsigned long ttl) struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create) { struct inet_peer __rcu **stack[PEER_MAXDEPTH], ***stackptr; - struct inet_peer_base *base = family_to_base(AF_INET); + struct inet_peer_base *base = family_to_base(daddr->family); struct inet_peer *p; /* Look up for the address quickly, lockless.