From e6be148dee2c28fe4d6a44ce1988b1aa8a5eb9f8 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 30 Dec 2009 15:54:03 +0200 Subject: [PATCH] --- yaml --- r: 183544 b: refs/heads/master c: fc5f75773c0b3c5b44785e4efcc54c5f496211a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3301c8356a95..c38f714d3e2d 100644 --- 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 index 00a1f4ccdaf1..72189661fc49 100644 --- 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; }