renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-04 03:33:58 +08:00
Code

staging: wfx: drop useless struct hif_rx_flags

Browse Source 
Struct hif_rx_flags has no reason to exist. Drop it and simplify access
to struct hif_ind_rx.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200907101521.66082-18-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:07 +02:00 committed by Greg Kroah-Hartman
parent 1d8652c14f
commit c57d834f22
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ void wfx_rx_cb(struct wfx_vif *wvif,
hdr->signal = arg->rcpi_rssi / 2 - 110;
hdr->antenna = 0;
if (arg->rx_flags.encryp)
if (arg->encryp)
hdr->flag |= RX_FLAG_DECRYPTED;
// Block ack negotiation is offloaded by the firmware. However,

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

@ -283,7 +283,12 @@ enum hif_ri_flags_encrypt {
HIF_RI_FLAGS_WAPI_ENCRYPTED = 0x4
};
struct hif_rx_flags {
struct hif_ind_rx {
__le32 status;
u8 channel_number;
u8 reserved1;
u8 rxed_rate;
u8 rcpi_rssi;
u8 encryp:3;
u8 in_aggr:1;
u8 first_aggr:1;
@ -295,7 +300,7 @@ struct hif_rx_flags {
u8 match_ssid:1;
u8 match_bssid:1;
u8 more:1;
u8 reserved1:1;
u8 reserved2:1;
u8 ht:1;
u8 stbc:1;
u8 match_uc_addr:1;
@ -303,23 +308,13 @@ struct hif_rx_flags {
u8 match_bc_addr:1;
u8 key_type:1;
u8 key_index:4;
u8 reserved2:1;
u8 reserved3:1;
u8 peer_sta_id:4;
u8 reserved3:2;
u8 reserved4:1;
} __packed;
struct hif_ind_rx {
__le32 status;
u8 channel_number;
u8 reserved;
u8 rxed_rate;
u8 rcpi_rssi;
struct hif_rx_flags rx_flags;
u8 reserved4:2;
u8 reserved5:1;
u8 frame[];
} __packed;
struct hif_req_edca_queue_params {
u8 queue_id;
u8 reserved1;