Skip to content

L
linux-davinci
Commit 0adc23f5 authored by John W. Linville's avatar John W. Linville
Browse files
Options

mac80211: support ETHTOOL_GPERMADDR 

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ff9fc791
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
net/mac80211/iface.c
View file @ 0adc23f5
...@@ -184,10 +184,12 @@ static int ieee80211_open(struct net_device *dev) ...@@ -184,10 +184,12 @@ static int ieee80211_open(struct net_device *dev)
* No need to check netif_running since we do not allow * No need to check netif_running since we do not allow
* it to start up with this invalid address. * 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, memcpy(ndev->dev_addr,
local->hw.wiphy->perm_addr, local->hw.wiphy->perm_addr,
ETH_ALEN); 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, ...@@ -784,6 +786,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
goto fail; goto fail;
memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); 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)); SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));
/* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */ /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment