Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / mac80211_hwsim.c

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 530648b399358754a307b1840a13b6a931e4ccff..fce49ba061d55cb57166b4935ef9de275f7b25cb 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -495,11 +495,9 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
        }
 
        if (changed & BSS_CHANGED_HT) {
-               printk(KERN_DEBUG "  %s: HT: sec_ch_offs=%d width_40_ok=%d "
-                      "op_mode=%d\n",
+               printk(KERN_DEBUG "  %s: HT: op_mode=0x%x\n",
                       wiphy_name(hw->wiphy),
-                      info->ht.secondary_channel_offset,
-                      info->ht.width_40_ok, info->ht.operation_mode);
+                      info->ht.operation_mode);
        }
 
        if (changed & BSS_CHANGED_BASIC_RATES) {
@@ -522,6 +520,10 @@ static void mac80211_hwsim_sta_notify(struct ieee80211_hw *hw,
        case STA_NOTIFY_REMOVE:
                hwsim_clear_sta_magic(sta);
                break;
+       case STA_NOTIFY_SLEEP:
+       case STA_NOTIFY_AWAKE:
+               /* TODO: make good use of these flags */
+               break;
        }
 }
 
@@ -777,6 +779,8 @@ static int __init init_mac80211_hwsim(void)
                        BIT(NL80211_IFTYPE_MESH_POINT);
                hw->ampdu_queues = 1;
 
+               hw->flags = IEEE80211_HW_MFP_CAPABLE;
+
                /* ask mac80211 to reserve space for magic */
                hw->vif_data_size = sizeof(struct hwsim_vif_priv);
                hw->sta_data_size = sizeof(struct hwsim_sta_priv);