4 files changed, 36 insertions, 21 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index e072fea69a30..ab3258ac0b2c 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1936,7 +1936,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
                              enum nl80211_channel_type channel_type,
                              bool channel_type_valid, unsigned int wait,
                              const u8 *buf, size_t len, bool no_cck,
-                             u64 *cookie)
+                             bool dont_wait_for_ack, u64 *cookie)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
         struct ieee80211_local *local = sdata->local;
@@ -1944,10 +1944,15 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
         struct sta_info *sta;
         struct ieee80211_work *wk;
         const struct ieee80211_mgmt *mgmt = (void *)buf;
-        u32 flags = IEEE80211_TX_INTFL_NL80211_FRAME_TX |
-                    IEEE80211_TX_CTL_REQ_TX_STATUS;
+        u32 flags;
         bool is_offchan = false;
 
+        if (dont_wait_for_ack)
+                flags = IEEE80211_TX_CTL_NO_ACK;
+        else
+                flags = IEEE80211_TX_INTFL_NL80211_FRAME_TX |
+                        IEEE80211_TX_CTL_REQ_TX_STATUS;
+
         /* Check that we are on the requested channel for transmission */
         if (chan != local->tmp_channel &&
             chan != local->oper_channel)
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 4c6ff4024356..1c7d4df5418c 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -378,7 +378,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev,
                           enum nl80211_channel_type channel_type,
                           bool channel_type_valid, unsigned int wait,
                           const u8 *buf, size_t len, bool no_cck,
-                          u64 *cookie);
+                          bool dont_wait_for_ack, u64 *cookie);
 
 /* SME */
 int __cfg80211_connect(struct cfg80211_registered_device *rdev,
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 34891e08c54a..6c1bafd508c8 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -904,7 +904,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev,
                           enum nl80211_channel_type channel_type,
                           bool channel_type_valid, unsigned int wait,
                           const u8 *buf, size_t len, bool no_cck,
-                          u64 *cookie)
+                          bool dont_wait_for_ack, u64 *cookie)
 {
         struct wireless_dev *wdev = dev->ieee80211_ptr;
         const struct ieee80211_mgmt *mgmt;
@@ -995,7 +995,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev,
         /* Transmit the Action frame as requested by user space */
         return rdev->ops->mgmt_tx(&rdev->wiphy, dev, chan, offchan,
                                   channel_type, channel_type_valid,
-                                  wait, buf, len, no_cck, cookie);
+                                  wait, buf, len, no_cck, dont_wait_for_ack,
+                                  cookie);
 }
 
 bool cfg80211_rx_mgmt(struct net_device *dev, int freq, const u8 *buf,
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 5b659068b020..0ef09415c89a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -196,6 +196,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_TDLS_OPERATION] = { .type = NLA_U8 },
         [NL80211_ATTR_TDLS_SUPPORT] = { .type = NLA_FLAG },
         [NL80211_ATTR_TDLS_EXTERNAL_SETUP] = { .type = NLA_FLAG },
+        [NL80211_ATTR_DONT_WAIT_FOR_ACK] = { .type = NLA_FLAG },
 };
 
 /* policy for the key attributes */
@@ -5282,10 +5283,11 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info)
         int err;
         void *hdr;
         u64 cookie;
-        struct sk_buff *msg;
+        struct sk_buff *msg = NULL;
         unsigned int wait = 0;
-        bool offchan;
-        bool no_cck;
+        bool offchan, no_cck, dont_wait_for_ack;
+
+        dont_wait_for_ack = info->attrs[NL80211_ATTR_DONT_WAIT_FOR_ACK];
 
         if (!info->attrs[NL80211_ATTR_FRAME] ||
             !info->attrs[NL80211_ATTR_WIPHY_FREQ])
@@ -5329,29 +5331,36 @@ static int nl80211_tx_mgmt(struct sk_buff *skb, struct genl_info *info)
         if (chan == NULL)
                 return -EINVAL;
 
-        msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
-        if (!msg)
-                return -ENOMEM;
+        if (!dont_wait_for_ack) {
+                msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+                if (!msg)
+                        return -ENOMEM;
 
-        hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
-                             NL80211_CMD_FRAME);
+                hdr = nl80211hdr_put(msg, info->snd_pid, info->snd_seq, 0,
+                                     NL80211_CMD_FRAME);
 
-        if (IS_ERR(hdr)) {
-                err = PTR_ERR(hdr);
-                goto free_msg;
+                if (IS_ERR(hdr)) {
+                        err = PTR_ERR(hdr);
+                        goto free_msg;
+                }
         }
+
         err = cfg80211_mlme_mgmt_tx(rdev, dev, chan, offchan, channel_type,
                                     channel_type_valid, wait,
                                     nla_data(info->attrs[NL80211_ATTR_FRAME]),
                                     nla_len(info->attrs[NL80211_ATTR_FRAME]),
-                                    no_cck, &cookie);
+                                    no_cck, dont_wait_for_ack, &cookie);
         if (err)
                 goto free_msg;
 
-        NLA_PUT_U64(msg, NL80211_ATTR_COOKIE, cookie);
+        if (msg) {
+                NLA_PUT_U64(msg, NL80211_ATTR_COOKIE, cookie);
 
-        genlmsg_end(msg, hdr);
-        return genlmsg_reply(msg, info);
+                genlmsg_end(msg, hdr);
+                return genlmsg_reply(msg, info);
+        }
+
+        return 0;
 
  nla_put_failure:
         err = -ENOBUFS;