Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/bridge/br_multicast: remove redundant variable "err"

The err is not modified after initalization, So remove it and make
it to be void function.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

zhong jiang and committed by
David S. Miller
9c2e955c be1459de

+5 -7
+5 -7
net/bridge/br_multicast.c
··· 1423 1423 br_multicast_mark_router(br, port); 1424 1424 } 1425 1425 1426 - static int br_ip4_multicast_query(struct net_bridge *br, 1427 - struct net_bridge_port *port, 1428 - struct sk_buff *skb, 1429 - u16 vid) 1426 + static void br_ip4_multicast_query(struct net_bridge *br, 1427 + struct net_bridge_port *port, 1428 + struct sk_buff *skb, 1429 + u16 vid) 1430 1430 { 1431 1431 const struct iphdr *iph = ip_hdr(skb); 1432 1432 struct igmphdr *ih = igmp_hdr(skb); ··· 1439 1439 unsigned long now = jiffies; 1440 1440 unsigned int offset = skb_transport_offset(skb); 1441 1441 __be32 group; 1442 - int err = 0; 1443 1442 1444 1443 spin_lock(&br->multicast_lock); 1445 1444 if (!netif_running(br->dev) || ··· 1497 1498 1498 1499 out: 1499 1500 spin_unlock(&br->multicast_lock); 1500 - return err; 1501 1501 } 1502 1502 1503 1503 #if IS_ENABLED(CONFIG_IPV6) ··· 1826 1828 err = br_ip4_multicast_igmp3_report(br, port, skb_trimmed, vid); 1827 1829 break; 1828 1830 case IGMP_HOST_MEMBERSHIP_QUERY: 1829 - err = br_ip4_multicast_query(br, port, skb_trimmed, vid); 1831 + br_ip4_multicast_query(br, port, skb_trimmed, vid); 1830 1832 break; 1831 1833 case IGMP_HOST_LEAVE_MESSAGE: 1832 1834 br_ip4_multicast_leave_group(br, port, ih->group, vid, src);