diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /net/ipv4/route.c | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 12ccf880eb8..167ea10b521 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -66,7 +66,6 @@ #include <linux/module.h> #include <asm/uaccess.h> -#include <asm/system.h> #include <linux/bitops.h> #include <linux/types.h> #include <linux/kernel.h> @@ -2042,7 +2041,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr, if (err < 0) goto e_err; } - rth = rt_dst_alloc(init_net.loopback_dev, + rth = rt_dst_alloc(dev_net(dev)->loopback_dev, IN_DEV_CONF_GET(in_dev, NOPOLICY), false); if (!rth) goto e_nobufs; |