Skip to content

Commit

Permalink
net/bridge/br_multicast: remove redundant variable "err"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
zhong jiang authored and David S. Miller committed Aug 6, 2018
1 parent be1459d commit 9c2e955
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions net/bridge/br_multicast.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) ||
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9c2e955

Please sign in to comment.