From: David Miller <davem@davemloft.net>
To: jslaby@suse.cz
Cc: jirislaby@gmail.com, linux-kernel@vger.kernel.org,
akpm@linux-foundation.org, mm-commits@vger.kernel.org,
netdev@vger.kernel.org, maxk@qualcomm.com
Subject: Re: tun routing is broken
Date: Sat, 05 Mar 2011 00:10:22 -0800 (PST) [thread overview]
Message-ID: <20110305.001022.183044112.davem@davemloft.net> (raw)
In-Reply-To: <4D71EE86.6030309@suse.cz>
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
next prev parent reply other threads:[~2011-03-05 8:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201103030127.p231ReNl012841@imap1.linux-foundation.org>
2011-03-04 8:56 ` tun: Failed to create tun sysfs files [was: mmotm 2011-03-02-16-52 uploaded] Jiri Slaby
2011-03-04 9:06 ` tun: Failed to create tun sysfs files David Miller
2011-03-04 9:37 ` Jiri Slaby
2011-03-05 8:04 ` tun routing is broken [was: tun: Failed to create tun sysfs files] Jiri Slaby
2011-03-05 8:10 ` David Miller [this message]
2011-03-05 8:17 ` tun routing is broken Jiri Slaby
2011-03-05 8:26 ` Jiri Slaby
2011-03-07 12:54 ` Jiri Kosina
2011-03-05 11:48 ` Valdis.Kletnieks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110305.001022.183044112.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=akpm@linux-foundation.org \
--cc=jirislaby@gmail.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=maxk@qualcomm.com \
--cc=mm-commits@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).