projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2b5a3f
)
bridge: remove redundant check on err in br_multicast_ipv4_rcv
author
Li RongQing
<
[email protected]
>
Tue, 19 Feb 2019 02:17:09 +0000
(10:17 +0800)
committer
David S. Miller
<
[email protected]
>
Thu, 21 Feb 2019 21:48:59 +0000
(13:48 -0800)
br_ip4_multicast_mrd_rcv only return 0 and -ENOMSG,
no other negative value
Signed-off-by: Li RongQing <
[email protected]
>
Acked-by: Roopa Prabhu <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/bridge/br_multicast.c
patch
|
blob
|
history
diff --git
a/net/bridge/br_multicast.c
b/net/bridge/br_multicast.c
index 4a048fd1cbea4fde550e2c83c2a0d386aca54187..fe9f2d8ca2c1680819fdd1e27c8367115a96f047 100644
(file)
--- 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;