diff mbox series

[net-next] bridge: remove redundant check on err in br_multicast_ipv4_rcv

Message ID 1550542629-17121-1-git-send-email-lirongqing@baidu.com
State Accepted
Delegated to: David Miller
Headers show
Series [net-next] bridge: remove redundant check on err in br_multicast_ipv4_rcv | expand

Commit Message

Li RongQing Feb. 19, 2019, 2:17 a.m. UTC
br_ip4_multicast_mrd_rcv only return 0 and -ENOMSG,
no other negative value

Signed-off-by: Li RongQing <lirongqing@baidu.com>
---
 net/bridge/br_multicast.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Roopa Prabhu Feb. 19, 2019, 5:27 p.m. UTC | #1
On Mon, Feb 18, 2019 at 6:17 PM Li RongQing <lirongqing@baidu.com> wrote:
>
> 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>

looks fine to me. CC Nikolay



>  net/bridge/br_multicast.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> 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;
> --
> 2.16.2
>
David Miller Feb. 21, 2019, 9:57 p.m. UTC | #2
From: Li RongQing <lirongqing@baidu.com>
Date: Tue, 19 Feb 2019 10:17:09 +0800

> br_ip4_multicast_mrd_rcv only return 0 and -ENOMSG,
> no other negative value
> 
> Signed-off-by: Li RongQing <lirongqing@baidu.com>

Applied.
diff mbox series

Patch

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;