---

yaml --- r: 335742 b: refs/heads/master c: 7702745 h: refs/heads/master v: v3
git-mirror · Nov 13, 2012 · c5ee6c9 · c5ee6c9
1 parent 195bf66
commit c5ee6c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a134884ac0e9fa48786560d49ed49c5f5f686410
+refs/heads/master: 7702745b15128e5f0659693736a864e35be1c807
diff --git a/trunk/drivers/s390/net/qeth_l2_main.c b/trunk/drivers/s390/net/qeth_l2_main.c
@@ -679,7 +679,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p)
 		return -ERESTARTSYS;
 	}
 	rc = qeth_l2_send_delmac(card, &card->dev->dev_addr[0]);
-	if (!rc)
+	if (!rc || (rc == IPA_RC_L2_MAC_NOT_FOUND))
 		rc = qeth_l2_send_setmac(card, addr->sa_data);
 	return rc ? -EINVAL : 0;
 }