Merge branch 'bkl-removal' of git://git.lwn.net/linux-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 b9230da925ee7a6d98a02d1d5d5b39b38a374138..f83d69e813d3a23cf46c8aefd94833147ab05d9f 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -368,7 +368,8 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
 
        hwsim_check_magic(vif);
 
-       if (vif->type != NL80211_IFTYPE_AP)
+       if (vif->type != NL80211_IFTYPE_AP &&
+           vif->type != NL80211_IFTYPE_MESH_POINT)
                return;
 
        skb = ieee80211_beacon_get(hw, vif);
@@ -451,9 +452,9 @@ static int mac80211_hwsim_config_interface(struct ieee80211_hw *hw,
        hwsim_check_magic(vif);
        if (conf->changed & IEEE80211_IFCC_BSSID) {
                DECLARE_MAC_BUF(mac);
-               printk(KERN_DEBUG "%s:%s: BSSID changed: %s\n",
+               printk(KERN_DEBUG "%s:%s: BSSID changed: %pM\n",
                       wiphy_name(hw->wiphy), __func__,
-                      print_mac(mac, conf->bssid));
+                      conf->bssid);
                memcpy(vp->bssid, conf->bssid, ETH_ALEN);
        }
        return 0;
@@ -494,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) {
@@ -521,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;
        }
 }
 
@@ -611,9 +614,8 @@ static void hwsim_send_ps_poll(void *dat, u8 *mac, struct ieee80211_vif *vif)
        if (!vp->assoc)
                return;
 
-       printk(KERN_DEBUG "%s:%s: send PS-Poll to %s for aid %d\n",
-              wiphy_name(data->hw->wiphy), __func__,
-              print_mac(buf, vp->bssid), vp->aid);
+       printk(KERN_DEBUG "%s:%s: send PS-Poll to %pM for aid %d\n",
+              wiphy_name(data->hw->wiphy), __func__, vp->bssid, vp->aid);
 
        skb = dev_alloc_skb(sizeof(*pspoll));
        if (!skb)
@@ -643,9 +645,8 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac,
        if (!vp->assoc)
                return;
 
-       printk(KERN_DEBUG "%s:%s: send data::nullfunc to %s ps=%d\n",
-              wiphy_name(data->hw->wiphy), __func__,
-              print_mac(buf, vp->bssid), ps);
+       printk(KERN_DEBUG "%s:%s: send data::nullfunc to %pM ps=%d\n",
+              wiphy_name(data->hw->wiphy), __func__, vp->bssid, ps);
 
        skb = dev_alloc_skb(sizeof(*hdr));
        if (!skb)
@@ -774,7 +775,8 @@ static int __init init_mac80211_hwsim(void)
                hw->queues = 4;
                hw->wiphy->interface_modes =
                        BIT(NL80211_IFTYPE_STATION) |
-                       BIT(NL80211_IFTYPE_AP);
+                       BIT(NL80211_IFTYPE_AP) |
+                       BIT(NL80211_IFTYPE_MESH_POINT);
                hw->ampdu_queues = 1;
 
                /* ask mac80211 to reserve space for magic */