From 34aa86ad8db64e8417f74e8f4d199316ae09ac68 Mon Sep 17 00:00:00 2001
From: Scott Feldman <scofeldm@cisco.com>
Date: Sat, 22 May 2010 17:29:58 +0000
Subject: [PATCH] --- yaml --- r: 198572 b: refs/heads/master c:
 418c437d8b4b87815f3afed89da2aa0078d5379d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/enic/enic_main.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b9ae5adfbc7..07b031d9029e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fc7f5730b71916bc44389015d404f668674c64c
+refs/heads/master: 418c437d8b4b87815f3afed89da2aa0078d5379d
diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c
index 7e973237bf98..6586b5c7e4b6 100644
--- a/trunk/drivers/net/enic/enic_main.c
+++ b/trunk/drivers/net/enic/enic_main.c
@@ -1132,6 +1132,14 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,
 	switch (request) {
 	case PORT_REQUEST_ASSOCIATE:
 
+		/* If the interface mac addr hasn't been assigned,
+		 * assign a random mac addr before setting port-
+		 * profile.
+		 */
+
+		if (is_zero_ether_addr(netdev->dev_addr))
+			random_ether_addr(netdev->dev_addr);
+
 		if (port[IFLA_PORT_PROFILE])
 			name = nla_data(port[IFLA_PORT_PROFILE]);