diff options
Diffstat (limited to 'net/mac80211/iface.c')
| -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 f6005adcbf90..87aff1d923ba 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -184,10 +184,12 @@ static int ieee80211_open(struct net_device *dev) | |||
| 184 | * No need to check netif_running since we do not allow | 184 | * No need to check netif_running since we do not allow |
| 185 | * it to start up with this invalid address. | 185 | * it to start up with this invalid address. |
| 186 | */ | 186 | */ |
| 187 | if (compare_ether_addr(null_addr, ndev->dev_addr) == 0) | 187 | if (compare_ether_addr(null_addr, ndev->dev_addr) == 0) { |
| 188 | memcpy(ndev->dev_addr, | 188 | memcpy(ndev->dev_addr, |
| 189 | local->hw.wiphy->perm_addr, | 189 | local->hw.wiphy->perm_addr, |
| 190 | ETH_ALEN); | 190 | ETH_ALEN); |
| 191 | memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN); | ||
| 192 | } | ||
| 191 | } | 193 | } |
| 192 | 194 | ||
| 193 | /* | 195 | /* |
| @@ -784,6 +786,7 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, | |||
| 784 | goto fail; | 786 | goto fail; |
| 785 | 787 | ||
| 786 | memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); | 788 | memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); |
| 789 | memcpy(ndev->perm_addr, ndev->dev_addr, ETH_ALEN); | ||
| 787 | SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); | 790 | SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); |
| 788 | 791 | ||
| 789 | /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */ | 792 | /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */ |