Commit cc3425cd authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents fc2ed77b 94f826b8

net/ipv6/route.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -2474,8 +2474,12 @@ static int rt6_fill_node(struct net *net, 




	rcu_read_lock();

	rcu_read_lock();

	n = dst_get_neighbour_noref(&rt->dst);

	n = dst_get_neighbour_noref(&rt->dst);

	if (n)

	if (n) {

		NLA_PUT(skb, RTA_GATEWAY, 16, &n->primary_key);

		if (nla_put(skb, RTA_GATEWAY, 16, &n->primary_key) < 0) {

			rcu_read_unlock();

			goto nla_put_failure;

		}

	}

	rcu_read_unlock();

	rcu_read_unlock();





	if (rt->dst.dev)

	if (rt->dst.dev)