Skip to content

Commit 5ea04da

Browse files
f0rm2l1nf0rm2l1n
committed
sys/linux: fix error defined attributes
Definitions for attribute `NBD_ATTR_SOCKETS`, `NL80211_ATTR_BSS_SELECT`, `NL80211_ATTR_PEER_MEASUREMENTS`, and `NL80211_ATTR_SCHED_SCAN_MATCH` have some errors. Fix them carefully, Check related parse functions: nbd_genl_reconfigure, parse_bss_select, nl80211_pmsr_start and nl80211_parse_sched_scan for details. Signed-off-by: Lin Ma <linma@zju.edu.cn>
1 parent 1c65791 commit 5ea04da

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

‎sys/linux/dev_nbd.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ nbd_attr_policy [
4242
NBD_ATTR_TIMEOUT nlattr[NBD_ATTR_TIMEOUT, int64]
4343
NBD_ATTR_SERVER_FLAGS nlattr[NBD_ATTR_SERVER_FLAGS, flags[nbd_server_flags, int64]]
4444
NBD_ATTR_CLIENT_FLAGS nlattr[NBD_ATTR_CLIENT_FLAGS, flags[nbd_client_flags, int64]]
45-
NBD_ATTR_SOCKETS nlnest[NBD_ATTR_SOCKETS, array[nlattr[NBD_SOCK_FD, sock_nbd_client]]]
45+
NBD_ATTR_SOCKETS nlnest[NBD_ATTR_SOCKETS, array[nlnest[NBD_SOCK_ITEM, nlattr[NBD_SOCK_FD, sock_nbd_client]]]]
4646
NBD_ATTR_DEAD_CONN_TIMEOUT nlattr[NBD_ATTR_DEAD_CONN_TIMEOUT, int64]
4747
NBD_ATTR_BACKEND_IDENTIFIER nlattr[NBD_ATTR_BACKEND_IDENTIFIER, stringnoz]
4848
] [varlen]

‎sys/linux/dev_nbd.txt.const‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ NBD_SET_SIZE_BLOCKS = 43783, mips64le:ppc64le:536914695
3535
NBD_SET_SOCK = 43776, mips64le:ppc64le:536914688
3636
NBD_SET_TIMEOUT = 43785, mips64le:ppc64le:536914697
3737
NBD_SOCK_FD = 1
38+
NBD_SOCK_ITEM = 1
3839
SOCK_STREAM = 1, mips64le:2
3940
__NR_ioctl = 54, amd64:16, arm64:riscv64:29, mips64le:5015
4041
__NR_sendmsg = 211, 386:s390x:370, amd64:46, arm:296, mips64le:5045, ppc64le:341

‎sys/linux/socket_netlink_generic_80211.txt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ sendmsg$NL80211_CMD_DISCONNECT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wd
7373
sendmsg$NL80211_CMD_UNEXPECTED_FRAME(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UNEXPECTED_FRAME, void]], f flags[send_flags])
7474
sendmsg$NL80211_CMD_NOTIFY_RADAR(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_NOTIFY_RADAR, nl80211_policy$chandef_params]], f flags[send_flags])
7575
sendmsg$NL80211_CMD_RADAR_DETECT(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_RADAR_DETECT, nl80211_policy$chandef_params]], f flags[send_flags])
76-
sendmsg$NL80211_CMD_PEER_MEASUREMENT_START(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_PEER_MEASUREMENT_START, nl80211_pmsr_attr_policy]], f flags[send_flags])
76+
sendmsg$NL80211_CMD_PEER_MEASUREMENT_START(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_PEER_MEASUREMENT_START, nl80211_policy$pmsr_measurement]], f flags[send_flags])
7777
sendmsg$NL80211_CMD_UPDATE_OWE_INFO(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_UPDATE_OWE_INFO, nl80211_policy$upd_owe_info]], f flags[send_flags])
7878
sendmsg$NL80211_CMD_GET_SURVEY(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_wdev[NL80211_CMD_GET_SURVEY, void]], f flags[send_flags])
7979
sendmsg$NL80211_CMD_GET_COALESCE(fd sock_nl_generic, msg ptr[in, msghdr_nl80211_rdev[NL80211_CMD_GET_COALESCE, void]], f flags[send_flags])
@@ -542,7 +542,7 @@ nl80211_policy$scan [
542542
NL80211_ATTR_BSSID nlattr[NL80211_ATTR_BSSID, ieee80211_bssid]
543543
NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST nlattr[NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST, nl80211_bss_select_rssi_adjust]
544544
NL80211_ATTR_SCAN_SUPP_RATES nlnest[NL80211_ATTR_SCAN_SUPP_RATES, array[nl80211_rates_policy]]
545-
NL80211_ATTR_SCHED_SCAN_MATCH nlnest[NL80211_ATTR_SCHED_SCAN_MATCH, array[nl80211_match_policy]]
545+
NL80211_ATTR_SCHED_SCAN_MATCH nlnest[NL80211_ATTR_SCHED_SCAN_MATCH, array[nlnest[0, array[nl80211_match_policy]]]]
546546
NL80211_ATTR_SCAN_FLAGS nlattr[NL80211_ATTR_SCAN_FLAGS, flags[nl80211_scan_flags, int32]]
547547
] [varlen]
548548

@@ -650,7 +650,7 @@ nl80211_policy$connect [
650650
NL80211_ATTR_VHT_CAPABILITY_MASK nlattr[NL80211_ATTR_VHT_CAPABILITY_MASK, ieee80211_vht_cap]
651651
NL80211_ATTR_USE_RRM nlattr[NL80211_ATTR_USE_RRM, void]
652652
NL80211_ATTR_PBSS nlattr[NL80211_ATTR_PBSS, void]
653-
NL80211_ATTR_BSS_SELECT nlnest[NL80211_ATTR_BSS_SELECT, array[nl80211_bss_select_policy]]
653+
NL80211_ATTR_BSS_SELECT nlnest[NL80211_ATTR_BSS_SELECT, nlattr[0, array[nl80211_bss_select_policy]]]
654654
NL80211_ATTR_EXTERNAL_AUTH_SUPPORT nlattr[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT, void]
655655
NL80211_ATTR_SOCKET_OWNER nlattr[NL80211_ATTR_SOCKET_OWNER, void]
656656
] [varlen]
@@ -691,10 +691,14 @@ nl80211_pmsr_peer_attr_policy [
691691
NL80211_PMSR_PEER_ATTR_REQ nlnest[NL80211_PMSR_PEER_ATTR_REQ, array[nl80211_pmsr_req_attr_policy]]
692692
] [varlen]
693693

694-
nl80211_pmsr_attr_policy [
695-
NL80211_PMSR_ATTR_PEERS nlnest[NL80211_PMSR_ATTR_PEERS, array[nlnest[0, array[nl80211_pmsr_peer_attr_policy]]]]
694+
nl80211_policy$pmsr_measurement [
695+
NL80211_ATTR_MAC nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
696+
NL80211_ATTR_TIMEOUT nlattr[NL80211_ATTR_TIMEOUT, int32]
697+
NL80211_ATTR_PEER_MEASUREMENTS nlnest[NL80211_ATTR_PEER_MEASUREMENTS, nl80211_pmsr_attr]
696698
] [varlen]
697699

700+
type nl80211_pmsr_attr nlnest[NL80211_PMSR_ATTR_PEERS, array[nlnest[0, array[nl80211_pmsr_peer_attr_policy]]]]
701+
698702
nl80211_policy$upd_owe_info [
699703
NL80211_ATTR_MAC nlattr[NL80211_ATTR_MAC, ieee80211_mac_addr]
700704
NL80211_ATTR_STATUS_CODE nlattr[NL80211_ATTR_STATUS_CODE, ieee80211_status_code[int16]]

0 commit comments

Comments
 (0)