Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2019-03-02 12:54:35 -08:00
parent cf29576fee 07f12b26e2
commit 9eb359140c
51 changed files with 409 additions and 107 deletions
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2876,7 +2876,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,

 	if (tb[RTA_IP_PROTO]) {
 		err = rtm_getroute_parse_ip_proto(tb[RTA_IP_PROTO],
-						  &ip_proto, extack);
+						  &ip_proto, AF_INET, extack);
 		if (err)
 			return err;
 	}