CHROMIUMOS: nl80211: Fix size of scan flags

Commit "nl80211: add api to abort a scan request on tx" specifies
a U32 for the scan flags parameter, but only sends a U8 when reporting
the scan event.  Fix this discrepancy.

Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chromium-os:20999
TEST=Make sure "iw event" continues to work correctly (nobody
depends on the flags parameter to the scan event yet).

Change-Id: I8ecb81ac23ad908fcb6ccb0d606e1d2749120d17
Reviewed-on: http://gerrit.chromium.org/gerrit/8499
Reviewed-by: Sam Leffler <sleffler@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 2142deb..8a013f7 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6935,7 +6935,7 @@ static int nl80211_add_scan_req(struct sk_buff *msg,
        if (req->ie)
                NLA_PUT(msg, NL80211_ATTR_IE, req->ie_len, req->ie);
 
-       NLA_PUT_U8(msg, NL80211_ATTR_SCAN_FLAGS, req->flags);
+       NLA_PUT_U32(msg, NL80211_ATTR_SCAN_FLAGS, req->flags);
 
        return 0;
  nla_put_failure: