drivers/net: Convert compare_ether_addr to ether_addr_equal

[deliverable/linux.git] / drivers / net / wireless / iwlegacy / 4965-mac.c

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 17f1c6853182d23ddfb092c3d0e7787a04ce0731..509301a5e7e264ae079201a246ded0252582308a 100644 (file)
--- 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)
        spin_lock_irqsave(&il->sta_lock, flags);
        for (i = start; i < il->hw_params.max_stations; i++)
                if (il->stations[i].used &&
-                   (!compare_ether_addr(il->stations[i].sta.sta.addr, addr))) {
+                   ether_addr_equal(il->stations[i].sta.sta.addr, addr)) {
                        ret = i;
                        goto out;
                }
@@ -2850,9 +2850,9 @@ void
 il4965_hwrate_to_tx_control(struct il_priv *il, u32 rate_n_flags,
                            struct ieee80211_tx_info *info)
 {
-       struct ieee80211_tx_rate *r = &info->control.rates[0];
+       struct ieee80211_tx_rate *r = &info->status.rates[0];
 
-       info->antenna_sel_tx =
+       info->status.antenna =
            ((rate_n_flags & RATE_MCS_ANT_ABC_MSK) >> RATE_MCS_ANT_POS);
        if (rate_n_flags & RATE_MCS_HT_MSK)
                r->flags |= IEEE80211_TX_RC_MCS;
@@ -5652,8 +5652,6 @@ il4965_bg_restart(struct work_struct *data)
 
        if (test_and_clear_bit(S_FW_ERROR, &il->status)) {
                mutex_lock(&il->mutex);
-               /* FIXME: do we dereference vif without mutex locked ? */
-               il->vif = NULL;
                il->is_open = 0;
 
                __il4965_down(il);