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.

diff --git a/datapath/brcompat.c b/datapath/brcompat.c
index ce152a28da8b0917c513dc61242795c5b9443132..a22998a6b1c9152fdfd9540b9822b7f4f63dbd51 100644 (file)
--- 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