1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 461014b7ccdd..736df59c16f5 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -757,6 +757,12 @@ static int ibmvnic_login(struct net_device *netdev)
                 }
         } while (adapter->renegotiate);
 
+        /* handle pending MAC address changes after successful login */
+        if (adapter->mac_change_pending) {
+                __ibmvnic_set_mac(netdev, &adapter->desired.mac);
+                adapter->mac_change_pending = false;
+        }
+
         return 0;
 }
 
@@ -994,11 +1000,6 @@ static int ibmvnic_open(struct net_device *netdev)
 
         mutex_lock(&adapter->reset_lock);
 
-        if (adapter->mac_change_pending) {
-                __ibmvnic_set_mac(netdev, &adapter->desired.mac);
-                adapter->mac_change_pending = false;
-        }
-
         if (adapter->state != VNIC_CLOSED) {
                 rc = ibmvnic_login(netdev);
                 if (rc) {
@@ -1532,7 +1533,7 @@ static int ibmvnic_set_mac(struct net_device *netdev, void *p)
         struct ibmvnic_adapter *adapter = netdev_priv(netdev);
         struct sockaddr *addr = p;
 
-        if (adapter->state != VNIC_OPEN) {
+        if (adapter->state == VNIC_PROBED) {
                 memcpy(&adapter->desired.mac, addr, sizeof(struct sockaddr));
                 adapter->mac_change_pending = true;
                 return 0;