diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-02-20 20:13:40 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-02-20 20:13:40 +0100 |
| commit | 4f0cd56d89c94c36a26c9d8d5df77eac16f6cc2c (patch) | |
| tree | 3ce5f129ce9df0b6044f28f7bcbd366924573f3b /net/ipv6/ndisc.c | |
| parent | 529907d16ca406a9a8ce1f9dae270fe5c198439a (diff) | |
| parent | 1d05f993784973189395051cc711fdd6dd5eb389 (diff) | |
| download | kernel_samsung_crespo-4f0cd56d89c94c36a26c9d8d5df77eac16f6cc2c.zip kernel_samsung_crespo-4f0cd56d89c94c36a26c9d8d5df77eac16f6cc2c.tar.gz kernel_samsung_crespo-4f0cd56d89c94c36a26c9d8d5df77eac16f6cc2c.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics.new
Conflicts:
mm/compaction.c
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 7596f07..10a8d41 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1244,7 +1244,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) rt = rt6_get_dflt_router(&ipv6_hdr(skb)->saddr, skb->dev); if (rt) - neigh = rt->rt6i_nexthop; + neigh = dst_get_neighbour(&rt->dst); if (rt && lifetime == 0) { neigh_clone(neigh); @@ -1265,7 +1265,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) return; } - neigh = rt->rt6i_nexthop; + neigh = dst_get_neighbour(&rt->dst); if (neigh == NULL) { ND_PRINTK0(KERN_ERR "ICMPv6 RA: %s() got default router without neighbour.\n", |