1 files changed, 37 insertions, 20 deletions

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 86fa8abdd66f..9d4a40ee16c4 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -9,7 +9,8 @@
 
 /*
  * TODO:
- * - IBSS mode simulation (Beacon transmission with competition for "air time")
+ * - Add TSF sync and fix IBSS beacon transmission by adding
+ *   competition for "air time" at TBTT
  * - RX filtering based on filter configuration (data->rx_filter)
  */
 
@@ -61,7 +62,7 @@ MODULE_PARM_DESC(fake_hw_scan, "Install fake (no-op) hw-scan handler");
  *      an intersection to occur but each device will still use their
  *      respective regulatory requested domains. Subsequent radios will
  *      use the resulting intersection.
- * @HWSIM_REGTEST_WORLD_ROAM: Used for testing the world roaming. We acomplish
+ * @HWSIM_REGTEST_WORLD_ROAM: Used for testing the world roaming. We accomplish
  *      this by using a custom beacon-capable regulatory domain for the first
  *      radio. All other device world roam.
  * @HWSIM_REGTEST_CUSTOM_WORLD: Used for testing the custom world regulatory
@@ -308,6 +309,8 @@ struct mac80211_hwsim_data {
          */
         u64 group;
         struct dentry *debugfs_group;
+
+        int power_level;
 };
 
 
@@ -496,7 +499,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
         rx_status.band = data->channel->band;
         rx_status.rate_idx = info->control.rates[0].idx;
         /* TODO: simulate real signal strength (and optional packet loss) */
-        rx_status.signal = -50;
+        rx_status.signal = data->power_level - 50;
 
         if (data->ps != PS_DISABLED)
                 hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PM);
@@ -538,7 +541,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
 }
 
 
-static int mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         bool ack;
         struct ieee80211_tx_info *txi;
@@ -548,7 +551,7 @@ static int mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         if (skb->len < 10) {
                 /* Should not happen; just a sanity check for addr1 use */
                 dev_kfree_skb(skb);
-                return NETDEV_TX_OK;
+                return;
         }
 
         ack = mac80211_hwsim_tx_frame(hw, skb);
@@ -568,7 +571,6 @@ static int mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         if (!(txi->flags & IEEE80211_TX_CTL_NO_ACK) && ack)
                 txi->flags |= IEEE80211_TX_STAT_ACK;
         ieee80211_tx_status_irqsafe(hw, skb);
-        return NETDEV_TX_OK;
 }
 
 
@@ -594,17 +596,34 @@ static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif)
 {
         wiphy_debug(hw->wiphy, "%s (type=%d mac_addr=%pM)\n",
-                    __func__, vif->type, vif->addr);
+                    __func__, ieee80211_vif_type_p2p(vif),
+                    vif->addr);
         hwsim_set_magic(vif);
         return 0;
 }
 
 
+static int mac80211_hwsim_change_interface(struct ieee80211_hw *hw,
+                                           struct ieee80211_vif *vif,
+                                           enum nl80211_iftype newtype,
+                                           bool newp2p)
+{
+        newtype = ieee80211_iftype_p2p(newtype, newp2p);
+        wiphy_debug(hw->wiphy,
+                    "%s (old type=%d, new type=%d, mac_addr=%pM)\n",
+                    __func__, ieee80211_vif_type_p2p(vif),
+                    newtype, vif->addr);
+        hwsim_check_magic(vif);
+
+        return 0;
+}
+
 static void mac80211_hwsim_remove_interface(
         struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 {
         wiphy_debug(hw->wiphy, "%s (type=%d mac_addr=%pM)\n",
-                    __func__, vif->type, vif->addr);
+                    __func__, ieee80211_vif_type_p2p(vif),
+                    vif->addr);
         hwsim_check_magic(vif);
         hwsim_clear_magic(vif);
 }
@@ -620,7 +639,8 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac,
         hwsim_check_magic(vif);
 
         if (vif->type != NL80211_IFTYPE_AP &&
-            vif->type != NL80211_IFTYPE_MESH_POINT)
+            vif->type != NL80211_IFTYPE_MESH_POINT &&
+            vif->type != NL80211_IFTYPE_ADHOC)
                 return;
 
         skb = ieee80211_beacon_get(hw, vif);
@@ -679,6 +699,7 @@ static int mac80211_hwsim_config(struct ieee80211_hw *hw, u32 changed)
         data->idle = !!(conf->flags & IEEE80211_CONF_IDLE);
 
         data->channel = conf->channel;
+        data->power_level = conf->power_level;
         if (!data->started || !data->beacon_int)
                 del_timer(&data->beacon_timer);
         else
@@ -921,7 +942,8 @@ static int mac80211_hwsim_testmode_cmd(struct ieee80211_hw *hw,
 static int mac80211_hwsim_ampdu_action(struct ieee80211_hw *hw,
                                        struct ieee80211_vif *vif,
                                        enum ieee80211_ampdu_mlme_action action,
-                                       struct ieee80211_sta *sta, u16 tid, u16 *ssn)
+                                       struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                                       u8 buf_size)
 {
         switch (action) {
         case IEEE80211_AMPDU_TX_START:
@@ -1025,6 +1047,7 @@ static struct ieee80211_ops mac80211_hwsim_ops =
         .start = mac80211_hwsim_start,
         .stop = mac80211_hwsim_stop,
         .add_interface = mac80211_hwsim_add_interface,
+        .change_interface = mac80211_hwsim_change_interface,
         .remove_interface = mac80211_hwsim_remove_interface,
         .config = mac80211_hwsim_config,
         .configure_filter = mac80211_hwsim_configure_filter,
@@ -1295,6 +1318,9 @@ static int __init init_mac80211_hwsim(void)
                 hw->wiphy->interface_modes =
                         BIT(NL80211_IFTYPE_STATION) |
                         BIT(NL80211_IFTYPE_AP) |
+                        BIT(NL80211_IFTYPE_P2P_CLIENT) |
+                        BIT(NL80211_IFTYPE_P2P_GO) |
+                        BIT(NL80211_IFTYPE_ADHOC) |
                         BIT(NL80211_IFTYPE_MESH_POINT);
 
                 hw->flags = IEEE80211_HW_MFP_CAPABLE |
@@ -1489,19 +1515,10 @@ static int __init init_mac80211_hwsim(void)
         if (hwsim_mon == NULL)
                 goto failed;
 
-        rtnl_lock();
-
-        err = dev_alloc_name(hwsim_mon, hwsim_mon->name);
-        if (err < 0)
-                goto failed_mon;
-
-
-        err = register_netdevice(hwsim_mon);
+        err = register_netdev(hwsim_mon);
         if (err < 0)
                 goto failed_mon;
 
-        rtnl_unlock();
-
         return 0;
 
 failed_mon: