From: Jakub Kicinski <kubakici@xxxxx> Once one of wiphy->addresses is found to be unused we can return from __ieee80211_assign_perm_addr and use it. The same for masked addresses. Signed-off-by: Jakub Kicinski <kubakici@xxxxx> --- net/mac80211/iface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index dbee397..38898b3 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1449,7 +1449,7 @@ static void __ieee80211_assign_perm_addr(struct ieee80211_local *local, if (!used) { memcpy(perm_addr, local->hw.wiphy->addresses[i].addr, ETH_ALEN); - break; + return; } } @@ -1507,10 +1507,12 @@ static void __ieee80211_assign_perm_addr(struct ieee80211_local *local, if (!used) { memcpy(perm_addr, tmp_addr, ETH_ALEN); - break; + return; } addr = (start & ~mask) | (val & mask); } while (addr != start); + + pr_debug("no free address found - using default\n"); } static void ieee80211_assign_perm_addr(struct ieee80211_local *local, -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html