| Message ID | 52AEA890.5020305@huawei.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, 2013-12-16 at 15:15 +0800, Ding Tianhong wrote: > - sdata->vif.addr, ETH_ALEN) == 0) { > + if (ether_addr_equal_unaligned(sdata->vif.addr, > + local->hw.wiphy->addresses[i].addr)) { Your indentation is terrible, I'm not applying this. johannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2013/12/16 15:47, Johannes Berg wrote: > On Mon, 2013-12-16 at 15:15 +0800, Ding Tianhong wrote: > >> - sdata->vif.addr, ETH_ALEN) == 0) { >> + if (ether_addr_equal_unaligned(sdata->vif.addr, >> + local->hw.wiphy->addresses[i].addr)) { > > Your indentation is terrible, I'm not applying this. > > johannes > ok, I'll fix it. Ding > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 7aa9f9d..be95eb7 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1497,8 +1497,8 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local, bool used = false; list_for_each_entry(sdata, &local->interfaces, list) { - if (memcmp(local->hw.wiphy->addresses[i].addr, - sdata->vif.addr, ETH_ALEN) == 0) { + if (ether_addr_equal_unaligned(sdata->vif.addr, + local->hw.wiphy->addresses[i].addr)) { used = true; break; } @@ -1558,8 +1558,8 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local, val += inc; list_for_each_entry(sdata, &local->interfaces, list) { - if (memcmp(tmp_addr, sdata->vif.addr, - ETH_ALEN) == 0) { + if (ether_addr_equal_unaligned(tmp_addr, + sdata->vif.addr)) { used = true; break; }
Joe Perches add ether_addr_equal_unaligned to test if possibly unaligned to u16 Ethernet addresses are equal. If CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is set, this uses the slightly faster generic routine ether_addr_equal, otherwise this uses memcmp. Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> --- net/mac80211/iface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)