aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
-rw-r--r--drivers/net/wireless/iwlegacy/3945.c4
-rw-r--r--drivers/net/wireless/iwlegacy/4965-mac.c2
-rw-r--r--drivers/net/wireless/iwlegacy/common.c14
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index b25c01be0d90..87e539894330 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -453,10 +453,10 @@ il3945_is_network_packet(struct il_priv *il, struct ieee80211_hdr *header)
453 switch (il->iw_mode) { 453 switch (il->iw_mode) {
454 case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source | BSSID */ 454 case NL80211_IFTYPE_ADHOC: /* Header: Dest. | Source | BSSID */
455 /* packets to our IBSS update information */ 455 /* packets to our IBSS update information */
456 return !compare_ether_addr(header->addr3, il->bssid); 456 return ether_addr_equal(header->addr3, il->bssid);
457 case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */ 457 case NL80211_IFTYPE_STATION: /* Header: Dest. | AP{BSSID} | Source */
458 /* packets to our IBSS update information */ 458 /* packets to our IBSS update information */
459 return !compare_ether_addr(header->addr2, il->bssid); 459 return ether_addr_equal(header->addr2, il->bssid);
460 default: 460 default:
461 return 1; 461 return 1;
462 } 462 }
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index f2baf94f069c..509301a5e7e2 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -2565,7 +2565,7 @@ il4965_find_station(struct il_priv *il, const u8 *addr)
2565 spin_lock_irqsave(&il->sta_lock, flags); 2565 spin_lock_irqsave(&il->sta_lock, flags);
2566 for (i = start; i < il->hw_params.max_stations; i++) 2566 for (i = start; i < il->hw_params.max_stations; i++)
2567 if (il->stations[i].used && 2567 if (il->stations[i].used &&
2568 (!compare_ether_addr(il->stations[i].sta.sta.addr, addr))) { 2568 ether_addr_equal(il->stations[i].sta.sta.addr, addr)) {
2569 ret = i; 2569 ret = i;
2570 goto out; 2570 goto out;
2571 } 2571 }
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index eaf249452e51..cbf2dc18341f 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -1896,8 +1896,8 @@ il_prep_station(struct il_priv *il, const u8 *addr, bool is_ap,
1896 sta_id = il->hw_params.bcast_id; 1896 sta_id = il->hw_params.bcast_id;
1897 else 1897 else
1898 for (i = IL_STA_ID; i < il->hw_params.max_stations; i++) { 1898 for (i = IL_STA_ID; i < il->hw_params.max_stations; i++) {
1899 if (!compare_ether_addr 1899 if (ether_addr_equal(il->stations[i].sta.sta.addr,
1900 (il->stations[i].sta.sta.addr, addr)) { 1900 addr)) {
1901 sta_id = i; 1901 sta_id = i;
1902 break; 1902 break;
1903 } 1903 }
@@ -1926,7 +1926,7 @@ il_prep_station(struct il_priv *il, const u8 *addr, bool is_ap,
1926 1926
1927 if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) && 1927 if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) &&
1928 (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) && 1928 (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) &&
1929 !compare_ether_addr(il->stations[sta_id].sta.sta.addr, addr)) { 1929 ether_addr_equal(il->stations[sta_id].sta.sta.addr, addr)) {
1930 D_ASSOC("STA %d (%pM) already added, not adding again.\n", 1930 D_ASSOC("STA %d (%pM) already added, not adding again.\n",
1931 sta_id, addr); 1931 sta_id, addr);
1932 return sta_id; 1932 return sta_id;
@@ -3744,10 +3744,10 @@ il_full_rxon_required(struct il_priv *il)
3744 3744
3745 /* These items are only settable from the full RXON command */ 3745 /* These items are only settable from the full RXON command */
3746 CHK(!il_is_associated(il)); 3746 CHK(!il_is_associated(il));
3747 CHK(compare_ether_addr(staging->bssid_addr, active->bssid_addr)); 3747 CHK(!ether_addr_equal(staging->bssid_addr, active->bssid_addr));
3748 CHK(compare_ether_addr(staging->node_addr, active->node_addr)); 3748 CHK(!ether_addr_equal(staging->node_addr, active->node_addr));
3749 CHK(compare_ether_addr 3749 CHK(!ether_addr_equal(staging->wlap_bssid_addr,
3750 (staging->wlap_bssid_addr, active->wlap_bssid_addr)); 3750 active->wlap_bssid_addr));
3751 CHK_NEQ(staging->dev_type, active->dev_type); 3751 CHK_NEQ(staging->dev_type, active->dev_type);
3752 CHK_NEQ(staging->channel, active->channel); 3752 CHK_NEQ(staging->channel, active->channel);
3753 CHK_NEQ(staging->air_propagation, active->air_propagation); 3753 CHK_NEQ(staging->air_propagation, active->air_propagation);