From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Wed, 22 Apr 2015 08:27:07 +0000 (+0200)
Subject: mroute: remove invalid check against NLM_F_MULTI
X-Git-Tag: v4.1.0~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=505f91869f559f492db1afde0b1b4ba8fae9a425;p=thirdparty%2Fiproute2.git

mroute: remove invalid check against NLM_F_MULTI

This flag is only for the netlink protocol (multi-part messages), no reason
to reject messages without it.

Note that this flag was removed by the following kernel patches (v3.14)
65886f439ab0 ipmr: fix mfc notification flags
f518338b1603 ip6mr: fix mfc notification flags

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---

diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index 13ac89251..125a13f8c 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -67,8 +67,7 @@ int print_mroute(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 	int family;
 
 	if ((n->nlmsg_type != RTM_NEWROUTE &&
-	     n->nlmsg_type != RTM_DELROUTE) ||
-	    !(n->nlmsg_flags & NLM_F_MULTI)) {
+	     n->nlmsg_type != RTM_DELROUTE)) {
 		fprintf(stderr, "Not a multicast route: %08x %08x %08x\n",
 			n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags);
 		return 0;