Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

[~andy/linux] / net / wireless / nl80211.c

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 741368c31270d0066c5adbd8f744a3d9b5b61ff8..af8d84a4a5b2a05fab2de732722e6535c8e699d0 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -10450,7 +10450,7 @@ EXPORT_SYMBOL(cfg80211_rx_unexpected_4addr_frame);
 int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
                      struct wireless_dev *wdev, u32 nlportid,
                      int freq, int sig_dbm,
-                     const u8 *buf, size_t len, gfp_t gfp)
+                     const u8 *buf, size_t len, u32 flags, gfp_t gfp)
 {
        struct net_device *netdev = wdev->netdev;
        struct sk_buff *msg;
@@ -10473,7 +10473,9 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
            nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq) ||
            (sig_dbm &&
             nla_put_u32(msg, NL80211_ATTR_RX_SIGNAL_DBM, sig_dbm)) ||
-           nla_put(msg, NL80211_ATTR_FRAME, len, buf))
+           nla_put(msg, NL80211_ATTR_FRAME, len, buf) ||
+           (flags &&
+            nla_put_u32(msg, NL80211_ATTR_RXMGMT_FLAGS, flags)))
                goto nla_put_failure;
 
        genlmsg_end(msg, hdr);