---

yaml --- r: 183544 b: refs/heads/master c: fc5f757 h: refs/heads/master v: v3
git-mirror · Jan 5, 2010 · e6be148 · e6be148
1 parent 04b2296
commit e6be148
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1990ca6113399be9249433d5ab377a2a444f1dd8
+refs/heads/master: fc5f75773c0b3c5b44785e4efcc54c5f496211a9
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -63,15 +63,16 @@ static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
 static int ieee80211_change_mac(struct net_device *dev, void *addr)
 {
 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+	struct sockaddr *sa = addr;
 	int ret;
 
 	if (ieee80211_sdata_running(sdata))
 		return -EBUSY;
 
-	ret = eth_mac_addr(dev, addr);
+	ret = eth_mac_addr(dev, sa);
 
 	if (ret == 0)
-		memcpy(sdata->vif.addr, addr, ETH_ALEN);
+		memcpy(sdata->vif.addr, sa->sa_data, ETH_ALEN);
 
 	return ret;
 }