Merge tag 'afs-next-20180208' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...

[sfrench/cifs-2.6.git] / drivers / infiniband / ulp / ipoib / ipoib_main.c

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 5930c7d9a8fbc56ff59f00f828642abb7a0061ee..161ba8c76285cb41a18f9af304860498e0af89e0 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -2306,6 +2306,9 @@ static struct net_device *ipoib_add_port(const char *format,
                              priv->ca, ipoib_event);
        ib_register_event_handler(&priv->event_handler);
 
+       /* call event handler to ensure pkey in sync */
+       queue_work(ipoib_workqueue, &priv->flush_heavy);
+
        result = register_netdev(priv->dev);
        if (result) {
                pr_warn("%s: couldn't register ipoib port %d; error %d\n",