diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2016-02-26 21:20:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-01 16:55:07 -0500 |
| commit | 4950cfd1e6a85b5e079a78f19792e6ec54199170 (patch) | |
| tree | f5c7fed1ade3dfea8f50b3bd8b9cc98a4b4f141a | |
| parent | 7f0aec7a668419bdbff12de6e8016544f874e708 (diff) | |
| download | lwn-4950cfd1e6a85b5e079a78f19792e6ec54199170.tar.gz lwn-4950cfd1e6a85b5e079a78f19792e6ec54199170.zip | |
bridge: mcast: do nothing if port's multicast_router is set to the same val
This is needed for the upcoming temporary port router. There's no point
to go through the logic if the value is the same.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/bridge/br_multicast.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 71c109b0943f..f1140cf5168d 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1853,7 +1853,10 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val) int err = -EINVAL; spin_lock(&br->multicast_lock); - + if (p->multicast_router == val) { + err = 0; + goto unlock; + } switch (val) { case MDB_RTR_TYPE_DISABLED: p->multicast_router = MDB_RTR_TYPE_DISABLED; |