UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: wfx: drop useless struct hif_ie_flags 

Struct hif_ie_flags has no reason to exist. Drop it and simplify
access to struct hif_req_update_ie.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-12-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérôme Pouiller 2020-09-07 12:15:01 +02:00 committed by Greg Kroah-Hartman
parent 3d5c42c9d0
commit dcbbbc111d
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/wfx/hif_api_cmd.h
View File

@ -93,14 +93,6 @@ struct hif_cnf_write_mib {
__le32 status; __le32 status;
} __packed; } __packed;
struct hif_ie_flags {
u8 beacon:1;
u8 probe_resp:1;
u8 probe_req:1;
u8 reserved1:5;
u8 reserved2;
} __packed;
struct hif_ie_tlv { struct hif_ie_tlv {
u8 type; u8 type;
u8 length; u8 length;
@ -108,7 +100,11 @@ struct hif_ie_tlv {
} __packed; } __packed;
struct hif_req_update_ie { struct hif_req_update_ie {
struct hif_ie_flags ie_flags; u8 beacon:1;
u8 probe_resp:1;
u8 probe_req:1;
u8 reserved1:5;
u8 reserved2;
__le16 num_ies; __le16 num_ies;
struct hif_ie_tlv ie[]; struct hif_ie_tlv ie[];
} __packed; } __packed;

2
drivers/staging/wfx/hif_tx.c
View File

@ -520,7 +520,7 @@ int hif_update_ie_beacon(struct wfx_vif *wvif, const u8 *ies, size_t ies_len)
if (!hif) if (!hif)
return -ENOMEM; return -ENOMEM;
body->ie_flags.beacon = 1; body->beacon = 1;
body->num_ies = cpu_to_le16(1); body->num_ies = cpu_to_le16(1);
memcpy(body->ie, ies, ies_len); memcpy(body->ie, ies, ies_len);
wfx_fill_header(hif, wvif->id, HIF_REQ_ID_UPDATE_IE, buf_len); wfx_fill_header(hif, wvif->id, HIF_REQ_ID_UPDATE_IE, buf_len);