From: Li RongQing <lirongqing@baidu.com>
Date: Tue, 19 Feb 2019 02:17:09 +0000 (+0800)
Subject: bridge: remove redundant check on err in br_multicast_ipv4_rcv
X-Git-Tag: v5.1-rc1~178^2~143
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=08e71623c8223723b19d079933974645d52967c6;p=users%2Fwilly%2Fxarray.git

bridge: remove redundant check on err in br_multicast_ipv4_rcv

br_ip4_multicast_mrd_rcv only return 0 and -ENOMSG,
no other negative value

Signed-off-by: Li RongQing <lirongqing@baidu.com>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 4a048fd1cbea..fe9f2d8ca2c1 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1615,12 +1615,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
 			if (ip_hdr(skb)->protocol == IPPROTO_PIM)
 				br_multicast_pim(br, port, skb);
 		} else if (ipv4_is_all_snoopers(ip_hdr(skb)->daddr)) {
-			err = br_ip4_multicast_mrd_rcv(br, port, skb);
-
-			if (err < 0 && err != -ENOMSG) {
-				br_multicast_err_count(br, port, skb->protocol);
-				return err;
-			}
+			br_ip4_multicast_mrd_rcv(br, port, skb);
 		}
 
 		return 0;