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>
This commit is contained in:
parent
be1459de2e
commit
9c2e955c48
1 changed files with 5 additions and 7 deletions
|
@ -1423,10 +1423,10 @@ static void br_multicast_query_received(struct net_bridge *br,
|
|||
br_multicast_mark_router(br, port);
|
||||
}
|
||||
|
||||
static int br_ip4_multicast_query(struct net_bridge *br,
|
||||
struct net_bridge_port *port,
|
||||
struct sk_buff *skb,
|
||||
u16 vid)
|
||||
static void br_ip4_multicast_query(struct net_bridge *br,
|
||||
struct net_bridge_port *port,
|
||||
struct sk_buff *skb,
|
||||
u16 vid)
|
||||
{
|
||||
const struct iphdr *iph = ip_hdr(skb);
|
||||
struct igmphdr *ih = igmp_hdr(skb);
|
||||
|
@ -1439,7 +1439,6 @@ static int br_ip4_multicast_query(struct net_bridge *br,
|
|||
unsigned long now = jiffies;
|
||||
unsigned int offset = skb_transport_offset(skb);
|
||||
__be32 group;
|
||||
int err = 0;
|
||||
|
||||
spin_lock(&br->multicast_lock);
|
||||
if (!netif_running(br->dev) ||
|
||||
|
@ -1498,7 +1497,6 @@ static int br_ip4_multicast_query(struct net_bridge *br,
|
|||
|
||||
out:
|
||||
spin_unlock(&br->multicast_lock);
|
||||
return err;
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
|
@ -1828,7 +1826,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
|
|||
err = br_ip4_multicast_igmp3_report(br, port, skb_trimmed, vid);
|
||||
break;
|
||||
case IGMP_HOST_MEMBERSHIP_QUERY:
|
||||
err = br_ip4_multicast_query(br, port, skb_trimmed, vid);
|
||||
br_ip4_multicast_query(br, port, skb_trimmed, vid);
|
||||
break;
|
||||
case IGMP_HOST_LEAVE_MESSAGE:
|
||||
br_ip4_multicast_leave_group(br, port, ih->group, vid, src);
|
||||
|
|
Loading…
Reference in a new issue