From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 6 Oct 2009 20:27:18 +0000 (-0400)
Subject: mac80211: support ETHTOOL_GPERMADDR
X-Git-Tag: v2.6.33-rc1~388^2~865^2~24
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0adc23f58e21cb47be998063ea1b82de33ccdd46;p=~emulex%2Finfiniband.git

mac80211: support ETHTOOL_GPERMADDR

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index f6005adcbf9..87aff1d923b 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -184,10 +184,12 @@ static int ieee80211_open(struct net_device *dev)
 		 * No need to check netif_running since we do not allow
 		 * it to start up with this invalid address.
 		 */
-		if (compare_ether_addr(null_addr, ndev->dev_addr) == 0)
+		if (compare_ether_addr(null_addr, ndev->dev_addr) == 0) {
 			memcpy(ndev->dev_addr,
 			       local->hw.wiphy->perm_addr,
 			       ETH_ALEN);
+			memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN);
+		}
 	}
 
 	/*
@@ -784,6 +786,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 		goto fail;
 
 	memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
+	memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN);
 	SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
 
 	/* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */