* [PATCH][net-next] bridge: remove redundant check on err in br_multicast_ipv4_rcv
@ 2019-02-19 2:17 Li RongQing
2019-02-19 17:27 ` Roopa Prabhu
2019-02-21 21:57 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Li RongQing @ 2019-02-19 2:17 UTC (permalink / raw)
To: netdev
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH][net-next] bridge: remove redundant check on err in br_multicast_ipv4_rcv
2019-02-19 2:17 [PATCH][net-next] bridge: remove redundant check on err in br_multicast_ipv4_rcv Li RongQing
@ 2019-02-19 17:27 ` Roopa Prabhu
2019-02-21 21:57 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Roopa Prabhu @ 2019-02-19 17:27 UTC (permalink / raw)
To: Li RongQing; +Cc: netdev, Nikolay Aleksandrov
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH][net-next] bridge: remove redundant check on err in br_multicast_ipv4_rcv
2019-02-19 2:17 [PATCH][net-next] bridge: remove redundant check on err in br_multicast_ipv4_rcv Li RongQing
2019-02-19 17:27 ` Roopa Prabhu
@ 2019-02-21 21:57 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2019-02-21 21:57 UTC (permalink / raw)
To: lirongqing; +Cc: netdev
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-21 21:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-19 2:17 [PATCH][net-next] bridge: remove redundant check on err in br_multicast_ipv4_rcv Li RongQing
2019-02-19 17:27 ` Roopa Prabhu
2019-02-21 21:57 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox