Skip to content

Commit 56789ee

Browse files
committed
ath10k: htt: remove array of flexible structures
I updated to sparse v0.6.4 and it warns: drivers/net/wireless/ath/ath10k/hw.c: note: in included file (through drivers/net/wireless/ath/ath10k/core.h): drivers/net/wireless/ath/ath10k/htt.h:1503:41: warning: array of flexible structures drivers/net/wireless/ath/ath10k/htt_rx.c: note: in included file (through drivers/net/wireless/ath/ath10k/core.h): drivers/net/wireless/ath/ath10k/htt.h:1503:41: warning: array of flexible structures The structure is unused in ath10k so let's just remove it. Compile tested only. Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 3bf2537 commit 56789ee

File tree

1 file changed

+0
-110
lines changed
  • drivers/net/wireless/ath/ath10k

1 file changed

+0
-110
lines changed

drivers/net/wireless/ath/ath10k/htt.h

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,115 +1400,6 @@ enum htt_dbg_stats_status {
14001400
HTT_DBG_STATS_STATUS_SERIES_DONE = 7
14011401
};
14021402

1403-
/*
1404-
* target -> host statistics upload
1405-
*
1406-
* The following field definitions describe the format of the HTT target
1407-
* to host stats upload confirmation message.
1408-
* The message contains a cookie echoed from the HTT host->target stats
1409-
* upload request, which identifies which request the confirmation is
1410-
* for, and a series of tag-length-value stats information elements.
1411-
* The tag-length header for each stats info element also includes a
1412-
* status field, to indicate whether the request for the stat type in
1413-
* question was fully met, partially met, unable to be met, or invalid
1414-
* (if the stat type in question is disabled in the target).
1415-
* A special value of all 1's in this status field is used to indicate
1416-
* the end of the series of stats info elements.
1417-
*
1418-
*
1419-
* |31 16|15 8|7 5|4 0|
1420-
* |------------------------------------------------------------|
1421-
* | reserved | msg type |
1422-
* |------------------------------------------------------------|
1423-
* | cookie LSBs |
1424-
* |------------------------------------------------------------|
1425-
* | cookie MSBs |
1426-
* |------------------------------------------------------------|
1427-
* | stats entry length | reserved | S |stat type|
1428-
* |------------------------------------------------------------|
1429-
* | |
1430-
* | type-specific stats info |
1431-
* | |
1432-
* |------------------------------------------------------------|
1433-
* | stats entry length | reserved | S |stat type|
1434-
* |------------------------------------------------------------|
1435-
* | |
1436-
* | type-specific stats info |
1437-
* | |
1438-
* |------------------------------------------------------------|
1439-
* | n/a | reserved | 111 | n/a |
1440-
* |------------------------------------------------------------|
1441-
* Header fields:
1442-
* - MSG_TYPE
1443-
* Bits 7:0
1444-
* Purpose: identifies this is a statistics upload confirmation message
1445-
* Value: 0x9
1446-
* - COOKIE_LSBS
1447-
* Bits 31:0
1448-
* Purpose: Provide a mechanism to match a target->host stats confirmation
1449-
* message with its preceding host->target stats request message.
1450-
* Value: LSBs of the opaque cookie specified by the host-side requestor
1451-
* - COOKIE_MSBS
1452-
* Bits 31:0
1453-
* Purpose: Provide a mechanism to match a target->host stats confirmation
1454-
* message with its preceding host->target stats request message.
1455-
* Value: MSBs of the opaque cookie specified by the host-side requestor
1456-
*
1457-
* Stats Information Element tag-length header fields:
1458-
* - STAT_TYPE
1459-
* Bits 4:0
1460-
* Purpose: identifies the type of statistics info held in the
1461-
* following information element
1462-
* Value: htt_dbg_stats_type
1463-
* - STATUS
1464-
* Bits 7:5
1465-
* Purpose: indicate whether the requested stats are present
1466-
* Value: htt_dbg_stats_status, including a special value (0x7) to mark
1467-
* the completion of the stats entry series
1468-
* - LENGTH
1469-
* Bits 31:16
1470-
* Purpose: indicate the stats information size
1471-
* Value: This field specifies the number of bytes of stats information
1472-
* that follows the element tag-length header.
1473-
* It is expected but not required that this length is a multiple of
1474-
* 4 bytes. Even if the length is not an integer multiple of 4, the
1475-
* subsequent stats entry header will begin on a 4-byte aligned
1476-
* boundary.
1477-
*/
1478-
1479-
#define HTT_STATS_CONF_ITEM_INFO_STAT_TYPE_MASK 0x1F
1480-
#define HTT_STATS_CONF_ITEM_INFO_STAT_TYPE_LSB 0
1481-
#define HTT_STATS_CONF_ITEM_INFO_STATUS_MASK 0xE0
1482-
#define HTT_STATS_CONF_ITEM_INFO_STATUS_LSB 5
1483-
1484-
struct htt_stats_conf_item {
1485-
union {
1486-
u8 info;
1487-
struct {
1488-
u8 stat_type:5; /* %HTT_DBG_STATS_ */
1489-
u8 status:3; /* %HTT_DBG_STATS_STATUS_ */
1490-
} __packed;
1491-
} __packed;
1492-
u8 pad;
1493-
__le16 length;
1494-
u8 payload[]; /* roundup(length, 4) long */
1495-
} __packed;
1496-
1497-
struct htt_stats_conf {
1498-
u8 pad[3];
1499-
__le32 cookie_lsb;
1500-
__le32 cookie_msb;
1501-
1502-
/* each item has variable length! */
1503-
struct htt_stats_conf_item items[];
1504-
} __packed;
1505-
1506-
static inline struct htt_stats_conf_item *htt_stats_conf_next_item(
1507-
const struct htt_stats_conf_item *item)
1508-
{
1509-
return (void *)item + sizeof(*item) + roundup(item->length, 4);
1510-
}
1511-
15121403
/*
15131404
* host -> target FRAG DESCRIPTOR/MSDU_EXT DESC bank
15141405
*
@@ -1828,7 +1719,6 @@ struct htt_resp {
18281719
struct htt_rc_update rc_update;
18291720
struct htt_rx_test rx_test;
18301721
struct htt_pktlog_msg pktlog_msg;
1831-
struct htt_stats_conf stats_conf;
18321722
struct htt_rx_pn_ind rx_pn_ind;
18331723
struct htt_rx_offload_ind rx_offload_ind;
18341724
struct htt_rx_in_ord_ind rx_in_ord_ind;

0 commit comments

Comments
 (0)