From: Mark Brown <broonie@linaro.org>
Date: Thu, 12 Jun 2014 10:22:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~106
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bda15ed54357438acac98d7183a5f048c7b867b1;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
	kernel/futex.c
	net/ipv6/route.c
---

bda15ed54357438acac98d7183a5f048c7b867b1
diff --cc net/ipv6/route.c
index b2614b22622b,8ecf44af7c2e..18e27efa1bc3
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -727,11 -683,7 +725,10 @@@ int rt6_route_rcv(struct net_device *de
  		prefix = &prefix_buf;
  	}
  
 -	rt = rt6_get_route_info(dev, prefix, rinfo->prefix_len, gwaddr);
 +	if (rinfo->prefix_len == 0)
 +		rt = rt6_get_dflt_router(gwaddr, dev);
 +	else
- 		rt = rt6_get_route_info(net, prefix, rinfo->prefix_len,
- 					gwaddr, dev->ifindex);
++		rt = rt6_get_route_info(dev, prefix, rinfo->prefix_len, gwaddr);
  
  	if (rt && !lifetime) {
  		ip6_del_rt(rt);