Commit ccbac290 authored by Julia Lawall's avatar Julia Lawall Committed by John W. Linville

iwlegacy: use ether_addr_equal_64bits

Ether_addr_equal_64bits is more efficient than ether_addr_equal, and can be
used when each argument is an array within a structure that contains at
least two bytes of data beyond the array.

The structures involved are:
ieee80211_hdr defined in include/linux/ieee80211.h,
il_priv defined in drivers/net/wireless/iwlegacy/common.h and
il_rxon_cmd defined in drivers/net/wireless/iwlegacy/commands.h

This was done using Coccinelle (http://coccinelle.lip6.fr/).
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 90908e1c
...@@ -466,10 +466,10 @@ il3945_is_network_packet(struct il_priv *il, struct ieee80211_hdr *header) ...@@ -466,10 +466,10 @@ il3945_is_network_packet(struct il_priv *il, struct ieee80211_hdr *header)
switch (il->iw_mode) { switch (il->iw_mode) {
case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source | BSSID */ case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source | BSSID */
/* packets to our IBSS update information */ /* packets to our IBSS update information */
return ether_addr_equal(header->addr3, il->bssid); return ether_addr_equal_64bits(header->addr3, il->bssid);
case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */ case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */
/* packets to our IBSS update information */ /* packets to our IBSS update information */
return ether_addr_equal(header->addr2, il->bssid); return ether_addr_equal_64bits(header->addr2, il->bssid);
default: default:
return 1; return 1;
} }
......
...@@ -3746,9 +3746,9 @@ il_full_rxon_required(struct il_priv *il) ...@@ -3746,9 +3746,9 @@ il_full_rxon_required(struct il_priv *il)
/* These items are only settable from the full RXON command */ /* These items are only settable from the full RXON command */
CHK(!il_is_associated(il)); CHK(!il_is_associated(il));
CHK(!ether_addr_equal(staging->bssid_addr, active->bssid_addr)); CHK(!ether_addr_equal_64bits(staging->bssid_addr, active->bssid_addr));
CHK(!ether_addr_equal(staging->node_addr, active->node_addr)); CHK(!ether_addr_equal_64bits(staging->node_addr, active->node_addr));
CHK(!ether_addr_equal(staging->wlap_bssid_addr, CHK(!ether_addr_equal_64bits(staging->wlap_bssid_addr,
active->wlap_bssid_addr)); active->wlap_bssid_addr));
CHK_NEQ(staging->dev_type, active->dev_type); CHK_NEQ(staging->dev_type, active->dev_type);
CHK_NEQ(staging->channel, active->channel); CHK_NEQ(staging->channel, active->channel);
......
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