Merge "net: ipv6: ignore null_entry on route dumps" (79cd2220) · Commits · e / devices / android_kernel_sony_msm8998

net/ipv6/route.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -3200,6 +3200,10 @@ int rt6_dump_route(struct rt6_info rt, void p_arg)
		{
		struct rt6_rtnl_dump_arg arg = (struct rt6_rtnl_dump_arg ) p_arg;
		int prefix;
		struct net *net = arg->net;

		if (rt == net->ipv6.ip6_null_entry)
		return 0;

		if (nlmsg_len(arg->cb->nlh) >= sizeof(struct rtmsg)) {
		struct rtmsg *rtm = nlmsg_data(arg->cb->nlh);
		@@ -3207,7 +3211,7 @@ int rt6_dump_route(struct rt6_info rt, void p_arg)
		} else
		prefix = 0;

		return rt6_fill_node(arg->net,
		return rt6_fill_node(net,
		arg->skb, rt, NULL, NULL, 0, RTM_NEWROUTE,
		NETLINK_CB(arg->cb->skb).portid, arg->cb->nlh->nlmsg_seq,
		prefix, 0, NLM_F_MULTI);