mwifiex: add custom IE framework

[deliverable/linux.git] / drivers / net / wireless / mac80211_hwsim.c

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 2d913644d92b5d202a065dd55f1c6dab58bcdaca..fb787df0166699f9c31e7adf8ff25c924c08f7a8 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -699,6 +699,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
                    ieee80211_is_probe_resp(mgmt->frame_control))
                        mgmt->u.beacon.timestamp = cpu_to_le64(
                                rx_status.mactime +
+                               (data->tsf_offset - data2->tsf_offset) +
                                24 * 8 * 10 / txrate->bitrate);
 
                memcpy(IEEE80211_SKB_RXCB(nskb), &rx_status, sizeof(rx_status));
@@ -745,6 +746,11 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                hwsim_check_sta_magic(txi->control.sta);
 
        ieee80211_tx_info_clear_status(txi);
+
+       /* frame was transmitted at most favorable rate at first attempt */
+       txi->control.rates[0].count = 1;
+       txi->control.rates[1].idx = -1;
+
        if (!(txi->flags & IEEE80211_TX_CTL_NO_ACK) && ack)
                txi->flags |= IEEE80211_TX_STAT_ACK;
        ieee80211_tx_status_irqsafe(hw, skb);