diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 14 |
1 files changed, 7 insertions, 7 deletions
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); |