mac80211: minstrel: avoid accessing negative indices in rix_to_ndx()

[mv-sheeva.git] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8b6daf0219f4bb3a0d99ed1a68a484fcda754cd3..b7c8a4484298bc0c19f546440e33ae88ce1b8210 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -170,7 +170,7 @@ static int ieee80211_open(struct net_device *dev)
                        goto err_del_bss;
                /* we're brought up, everything changes */
                hw_reconf_flags = ~0;
-               ieee80211_led_radio(local, local->hw.conf.radio_enabled);
+               ieee80211_led_radio(local, true);
        }
 
        /*
@@ -560,7 +560,7 @@ static int ieee80211_stop(struct net_device *dev)
 
                drv_stop(local);
 
-               ieee80211_led_radio(local, 0);
+               ieee80211_led_radio(local, false);
 
                flush_workqueue(local->hw.workqueue);
 
@@ -964,5 +964,6 @@ void ieee80211_recalc_idle(struct ieee80211_local *local)
        mutex_lock(&local->iflist_mtx);
        chg = __ieee80211_recalc_idle(local);
        mutex_unlock(&local->iflist_mtx);
-       ieee80211_hw_config(local, chg);
+       if (chg)
+               ieee80211_hw_config(local, chg);
 }