Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / net / mac80211 / sta_info.c

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index c24770c..f2ba653 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -135,6 +135,7 @@ struct sta_info *sta_info_get_by_idx(struct ieee80211_local *local, int idx,
 /**
  * __sta_info_free - internal STA free helper
  *
+ * @local: pointer to the global information
  * @sta: STA info to free
  *
  * This function must undo everything done by sta_info_alloc()
@@ -235,6 +236,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
                return NULL;
 
        spin_lock_init(&sta->lock);
+       spin_lock_init(&sta->flaglock);
 
        memcpy(sta->addr, addr, ETH_ALEN);
        sta->local = local;
@@ -318,7 +320,9 @@ int sta_info_insert(struct sta_info *sta)
        /* notify driver */
        if (local->ops->sta_notify) {
                if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN)
-                       sdata = sdata->u.vlan.ap;
+                       sdata = container_of(sdata->bss,
+                                            struct ieee80211_sub_if_data,
+                                            u.ap);
 
                local->ops->sta_notify(local_to_hw(local), &sdata->vif,
                                       STA_NOTIFY_ADD, sta->addr);
@@ -373,8 +377,10 @@ static inline void __bss_tim_clear(struct ieee80211_if_ap *bss, u16 aid)
 static void __sta_info_set_tim_bit(struct ieee80211_if_ap *bss,
                                   struct sta_info *sta)
 {
-       if (bss)
-               __bss_tim_set(bss, sta->aid);
+       BUG_ON(!bss);
+
+       __bss_tim_set(bss, sta->aid);
+
        if (sta->local->ops->set_tim) {
                sta->local->tim_in_locked_section = true;
                sta->local->ops->set_tim(local_to_hw(sta->local), sta->aid, 1);
@@ -386,6 +392,8 @@ void sta_info_set_tim_bit(struct sta_info *sta)
 {
        unsigned long flags;
 
+       BUG_ON(!sta->sdata->bss);
+
        spin_lock_irqsave(&sta->local->sta_lock, flags);
        __sta_info_set_tim_bit(sta->sdata->bss, sta);
        spin_unlock_irqrestore(&sta->local->sta_lock, flags);
@@ -394,8 +402,10 @@ void sta_info_set_tim_bit(struct sta_info *sta)
 static void __sta_info_clear_tim_bit(struct ieee80211_if_ap *bss,
                                     struct sta_info *sta)
 {
-       if (bss)
-               __bss_tim_clear(bss, sta->aid);
+       BUG_ON(!bss);
+
+       __bss_tim_clear(bss, sta->aid);
+
        if (sta->local->ops->set_tim) {
                sta->local->tim_in_locked_section = true;
                sta->local->ops->set_tim(local_to_hw(sta->local), sta->aid, 0);
@@ -407,6 +417,8 @@ void sta_info_clear_tim_bit(struct sta_info *sta)
 {
        unsigned long flags;
 
+       BUG_ON(!sta->sdata->bss);
+
        spin_lock_irqsave(&sta->local->sta_lock, flags);
        __sta_info_clear_tim_bit(sta->sdata->bss, sta);
        spin_unlock_irqrestore(&sta->local->sta_lock, flags);
@@ -435,8 +447,9 @@ void __sta_info_unlink(struct sta_info **sta)
        list_del(&(*sta)->list);
 
        if (test_and_clear_sta_flags(*sta, WLAN_STA_PS)) {
-               if (sdata->bss)
-                       atomic_dec(&sdata->bss->num_sta_ps);
+               BUG_ON(!sdata->bss);
+
+               atomic_dec(&sdata->bss->num_sta_ps);
                __sta_info_clear_tim_bit(sdata->bss, *sta);
        }
 
@@ -444,7 +457,9 @@ void __sta_info_unlink(struct sta_info **sta)
 
        if (local->ops->sta_notify) {
                if (sdata->vif.type == IEEE80211_IF_TYPE_VLAN)
-                       sdata = sdata->u.vlan.ap;
+                       sdata = container_of(sdata->bss,
+                                            struct ieee80211_sub_if_data,
+                                            u.ap);
 
                local->ops->sta_notify(local_to_hw(local), &sdata->vif,
                                       STA_NOTIFY_REMOVE, (*sta)->addr);
@@ -553,8 +568,10 @@ static void sta_info_cleanup_expire_buffered(struct ieee80211_local *local,
 
                sdata = sta->sdata;
                local->total_ps_buffered--;
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
                printk(KERN_DEBUG "Buffered frame expired (STA "
                       "%s)\n", print_mac(mac, sta->addr));
+#endif
                dev_kfree_skb(skb);
 
                if (skb_queue_empty(&sta->ps_tx_buf))