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 2d2bfce24fc17633b6d3be370f7211bb0f94a9cb..fb787df0166699f9c31e7adf8ff25c924c08f7a8 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -582,11 +582,13 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                goto nla_put_failure;
        }
 
-       NLA_PUT(skb, HWSIM_ATTR_ADDR_TRANSMITTER,
-                    sizeof(struct mac_address), data->addresses[1].addr);
+       if (nla_put(skb, HWSIM_ATTR_ADDR_TRANSMITTER,
+                   sizeof(struct mac_address), data->addresses[1].addr))
+               goto nla_put_failure;
 
        /* We get the skb->data */
-       NLA_PUT(skb, HWSIM_ATTR_FRAME, my_skb->len, my_skb->data);
+       if (nla_put(skb, HWSIM_ATTR_FRAME, my_skb->len, my_skb->data))
+               goto nla_put_failure;
 
        /* We get the flags for this transmission, and we translate them to
           wmediumd flags  */
@@ -597,7 +599,8 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
        if (info->flags & IEEE80211_TX_CTL_NO_ACK)
                hwsim_flags |= HWSIM_TX_CTL_NO_ACK;
 
-       NLA_PUT_U32(skb, HWSIM_ATTR_FLAGS, hwsim_flags);
+       if (nla_put_u32(skb, HWSIM_ATTR_FLAGS, hwsim_flags))
+               goto nla_put_failure;
 
        /* We get the tx control (rate and retries) info*/
 
@@ -606,12 +609,14 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                tx_attempts[i].count = info->status.rates[i].count;
        }
 
-       NLA_PUT(skb, HWSIM_ATTR_TX_INFO,
-                    sizeof(struct hwsim_tx_rate)*IEEE80211_TX_MAX_RATES,
-                    tx_attempts);
+       if (nla_put(skb, HWSIM_ATTR_TX_INFO,
+                   sizeof(struct hwsim_tx_rate)*IEEE80211_TX_MAX_RATES,
+                   tx_attempts))
+               goto nla_put_failure;
 
        /* We create a cookie to identify this skb */
-       NLA_PUT_U64(skb, HWSIM_ATTR_COOKIE, (unsigned long) my_skb);
+       if (nla_put_u64(skb, HWSIM_ATTR_COOKIE, (unsigned long) my_skb))
+               goto nla_put_failure;
 
        genlmsg_end(skb, msg_head);
        genlmsg_unicast(&init_net, skb, dst_pid);
@@ -694,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));
@@ -740,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);
@@ -1108,7 +1119,8 @@ static int mac80211_hwsim_testmode_cmd(struct ieee80211_hw *hw,
                                                nla_total_size(sizeof(u32)));
                if (!skb)
                        return -ENOMEM;
-               NLA_PUT_U32(skb, HWSIM_TM_ATTR_PS, hwsim->ps);
+               if (nla_put_u32(skb, HWSIM_TM_ATTR_PS, hwsim->ps))
+                       goto nla_put_failure;
                return cfg80211_testmode_reply(skb);
        default:
                return -EOPNOTSUPP;