From: Stephen Hemminger <shemminger@vyatta•com>
To: "David S. Miller" <davem@davemloft•net>,
Herbert Xu <herbert@gondor•hengli.com.au>
Cc: netdev@vger•kernel.org
Subject: [PATCH net-next 1/4] bridge: simplify multicast_add_router
Date: Tue, 27 Apr 2010 18:01:04 -0700 [thread overview]
Message-ID: <20100428010336.068072153@vyatta.com> (raw)
In-Reply-To: 20100428010103.386761596@vyatta.com
[-- Attachment #1: br-mcast-list2.patch --]
[-- Type: text/plain, Size: 1172 bytes --]
By coding slightly differently, there are only two cases
to deal with: add at head and add after previous entry.
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/net/bridge/br_multicast.c 2010-04-27 17:02:06.720839467 -0700
+++ b/net/bridge/br_multicast.c 2010-04-27 17:11:06.518933878 -0700
@@ -1039,22 +1039,25 @@ static int br_ip6_multicast_mld2_report(
}
#endif
+/*
+ * Add port to rotuer_list
+ * list is maintained ordered by pointer value
+ * and locked by br->multicast_lock and RCU
+ */
static void br_multicast_add_router(struct net_bridge *br,
struct net_bridge_port *port)
{
struct net_bridge_port *p;
- struct hlist_node *n, *last = NULL;
+ struct hlist_node *n, *slot = NULL;
hlist_for_each_entry(p, n, &br->router_list, rlist) {
- if ((unsigned long) port >= (unsigned long) p) {
- hlist_add_before_rcu(n, &port->rlist);
- return;
- }
- last = n;
+ if ((unsigned long) port >= (unsigned long) p)
+ break;
+ slot = n;
}
- if (last)
- hlist_add_after_rcu(last, &port->rlist);
+ if (slot)
+ hlist_add_after_rcu(slot, &port->rlist);
else
hlist_add_head_rcu(&port->rlist, &br->router_list);
}
--
next prev parent reply other threads:[~2010-04-28 1:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 1:01 [PATCH net-next 0/4] Bridge IGMP cleanup and fixes Stephen Hemminger
2010-04-28 1:01 ` Stephen Hemminger [this message]
2010-04-28 1:01 ` [PATCH net-next 2/4] bridge: multicast flood Stephen Hemminger
2010-04-28 1:01 ` [PATCH net-next 3/4] bridge: multicast port group RCU fix Stephen Hemminger
2010-04-28 3:07 ` Herbert Xu
2010-04-28 3:47 ` Stephen Hemminger
2010-04-28 1:01 ` [PATCH net-next 4/4] bridge: multicast_flood cleanup Stephen Hemminger
2010-04-28 1:14 ` [PATCH net-next 0/4] Bridge IGMP cleanup and fixes David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100428010336.068072153@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=herbert@gondor$(echo .)hengli.com.au \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox