Messages in this thread Patch in this message | | | Date | Sat, 05 Mar 2011 00:10:22 -0800 (PST) | Subject | Re: tun routing is broken | From | David Miller <> |
| |
From: Jiri Slaby <jslaby@suse.cz> Date: Sat, 05 Mar 2011 09:04:22 +0100
> Ok, so I booted the new kernel, and tun is broken there completely. If I > try to ping a vpn peer:
-mm tree is missing this fix which went in yesterday. Please if you are going to be testing networking a lot, test against net-next-2.6 instead of Andrew's tree which invariable lags behind:
-------------------- ipv4: Fix __ip_dev_find() to use ifa_local instead of ifa_address.
Reported-by: Stephen Hemminger <shemminger@vyatta.com> Reported-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net> --- net/ipv4/devinet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 9038928..ff53860 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -111,7 +111,7 @@ static inline unsigned int inet_addr_hash(struct net *net, __be32 addr) static void inet_hash_insert(struct net *net, struct in_ifaddr *ifa) { - unsigned int hash = inet_addr_hash(net, ifa->ifa_address); + unsigned int hash = inet_addr_hash(net, ifa->ifa_local); spin_lock(&inet_addr_hash_lock); hlist_add_head_rcu(&ifa->hash, &inet_addr_lst[hash]); @@ -146,7 +146,7 @@ struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref) if (!net_eq(dev_net(dev), net)) continue; - if (ifa->ifa_address == addr) { + if (ifa->ifa_local == addr) { result = dev; break; } -- 1.7.4.1
| |