From 22e44f11a0dbbfb5839c2a3ee63e41195e9c7250 Mon Sep 17 00:00:00 2001 From: Keith Amidon Date: Mon, 16 Mar 2009 09:44:07 -0700 Subject: [PATCH] Wait longer for userspace on brcompat changes. We aren't returning to the caller of the bridge APIs until the userspace vswitchd completes changes. This timeout exists to return an error if that is taking too long. Extending it to error by being too conservative (waiting too long) in an attempt to make sure vswitch and the brcompat user don't get out of sync. --- datapath/brcompat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datapath/brcompat.c b/datapath/brcompat.c index ce152a28..a22998a6 100644 --- a/datapath/brcompat.c +++ b/datapath/brcompat.c @@ -394,12 +394,12 @@ int brc_send_port_add_del(struct net_device *dev, struct net_device *port, if (error) return error; - for (i = 0; i < 100; i++) { + for (i = 0; i < 50; i++) { int dev_ifindex = dev->ifindex; int port_ifindex = port->ifindex; rtnl_unlock(); - msleep(10); + msleep(100); rtnl_lock(); /* Since we released the RTNL lock, we have to make sure that -- 2.30.2