mac80211: slight optimization of addr compare

PATCH Superseded Ding Tianhong 2 participants 3 messages Dec 16, 2013

Subsystems (3)

Networking Network drivers mac80211

lore

Share & tools

lore

Ding Tianhong

author

2013-12-16 07:16 UTC #0 lore raw

PATCH 2/6 mac80211: slight optimization of addr compare

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 <[email protected]>

---
 net/mac80211/iface.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

net/mac80211/iface.c +4 -4

index 7aa9f9d..be95eb7 100644
@@ -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;
 				}

Signature · 1 line

1.8.0

Johannes Berg

maintainer

2013-12-16 07:51 UTC #1 lore raw

net/mac80211/iface.c static void ieee80211_assign_perm_addr(struct ieee80211_local *local, · line 1501

Quoted 3 lines · Ding Tianhong

net/mac80211/iface.c +2 -1

-					   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

Ding Tianhong

author

2013-12-16 08:05 UTC #2 lore raw

Quoted 10 lines · Johannes Berg

net/mac80211/iface.c static void ieee80211_assign_perm_addr(struct ieee80211_local *local, · line 1501
Quoted 3 lines · Ding Tianhong
net/mac80211/iface.c +2 -1
-					   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

Quoted 6 lines

--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html