diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-10-06 16:27:18 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:39:48 -0400 |
| commit | 0adc23f58e21cb47be998063ea1b82de33ccdd46 (patch) | |
| tree | 3cab85dd2b4b8b78360d5be0ade54ef112159df3 /net/mac80211 | |
| parent | ff9fc791940f9ff51387c35f9332efe5007154f1 (diff) | |
| download | linux-3.10-0adc23f58e21cb47be998063ea1b82de33ccdd46.tar.gz linux-3.10-0adc23f58e21cb47be998063ea1b82de33ccdd46.tar.bz2 linux-3.10-0adc23f58e21cb47be998063ea1b82de33ccdd46.zip | |
mac80211: support ETHTOOL_GPERMADDR
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/iface.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 */ |