MIPS: Lasat: Convert to proc_fops / seq_file

[safe/jmp/linux-2.6] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c484a88..6dc3579 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -354,7 +354,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
        sinfo->rx_packets = sta->rx_packets;
        sinfo->tx_packets = sta->tx_packets;
 
-       if (sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) {
+       if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||
+           (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {
                sinfo->filled |= STATION_INFO_SIGNAL;
                sinfo->signal = (s8)sta->last_signal;
        }
@@ -823,8 +824,10 @@ static int ieee80211_change_station(struct wiphy *wiphy,
                }
 
                if (params->vlan->ieee80211_ptr->use_4addr) {
-                       if (vlansdata->u.vlan.sta)
+                       if (vlansdata->u.vlan.sta) {
+                               rcu_read_unlock();
                                return -EBUSY;
+                       }
 
                        rcu_assign_pointer(vlansdata->u.vlan.sta, sta);
                }