Merge tag 'v3.10.105' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / ipv6 / route.c

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 84dd53c1c63e5e8f0864077cf2477cbc316dd03b..9f4b790cc2f02538b4506c4b5275633932e29c87 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2524,7 +2524,9 @@ static int rt6_fill_node(struct net *net,
        if (iif) {
 #ifdef CONFIG_IPV6_MROUTE
                if (ipv6_addr_is_multicast(&rt->rt6i_dst.addr)) {
-                       int err = ip6mr_get_route(net, skb, rtm, nowait);
+                       int err = ip6mr_get_route(net, skb, rtm, nowait,
+                                                 portid);
+
                        if (err <= 0) {
                                if (!nowait) {
                                        if (err == 0)