From 46961c2ff5619b7149fd458397170cb798ed1d12 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 23 Jan 2020 10:44:46 +0100 Subject: sys/linux: fix more netlink warnings Handle NLA_BITFIELD32. Match string attribtues better. Calculate and check min size for varlen structs. Fix NLA_UNSPEC size check. Fix some things in descriptions. Update #590 --- sys/linux/socket_netlink_generic_80211.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'sys/linux/socket_netlink_generic_80211.txt') diff --git a/sys/linux/socket_netlink_generic_80211.txt b/sys/linux/socket_netlink_generic_80211.txt index f7d4ea6ea..50e3fb91c 100644 --- a/sys/linux/socket_netlink_generic_80211.txt +++ b/sys/linux/socket_netlink_generic_80211.txt @@ -224,17 +224,17 @@ nl80211_policy_station [ NL80211_ATTR_MGMT_SUBTYPE nlattr[NL80211_ATTR_MGMT_SUBTYPE, flags[ieee80211_mgmt_subtype, int8]] NL80211_ATTR_REASON_CODE nlattr[NL80211_ATTR_REASON_CODE, int16] NL80211_ATTR_STA_AID nlattr[NL80211_ATTR_STA_AID, int16[1:IEEE80211_MAX_AID]] - NL80211_ATTR_VLAN_ID nlattr[NL80211_ATTR_VLAN_ID, int16[0:4]] + NL80211_ATTR_VLAN_ID nlattr[NL80211_ATTR_VLAN_ID, int16[1:4]] NL80211_ATTR_STA_LISTEN_INTERVAL nlattr[NL80211_ATTR_STA_LISTEN_INTERVAL, int16] - NL80211_ATTR_STA_SUPPORT_P2P_PS nlattr[NL80211_ATTR_STA_SUPPORT_P2P_PS, int8[0:NUM_NL80211_P2P_PS_STATUS]] + NL80211_ATTR_STA_SUPPORT_P2P_PS nlattr[NL80211_ATTR_STA_SUPPORT_P2P_PS, bool8] NL80211_ATTR_STA_SUPPORTED_RATES nlattr[NL80211_ATTR_STA_SUPPORTED_RATES, array[int8, 0:NL80211_MAX_SUPP_RATES]] NL80211_ATTR_STA_CAPABILITY nlattr[NL80211_ATTR_STA_CAPABILITY, int16] NL80211_ATTR_STA_EXT_CAPABILITY nlattr[NL80211_ATTR_STA_EXT_CAPABILITY, array[int8]] NL80211_ATTR_STA_FLAGS nlnest[NL80211_ATTR_STA_FLAGS, array[sta_flags_policy]] NL80211_ATTR_STA_FLAGS2 nlattr[NL80211_ATTR_STA_FLAGS2, nl80211_sta_flag_update] - NL80211_ATTR_STA_PLINK_ACTION nlattr[NL80211_ATTR_STA_PLINK_ACTION, int8[0:NUM_NL80211_PLINK_ACTIONS]] - NL80211_ATTR_STA_PLINK_STATE nlattr[NL80211_ATTR_STA_PLINK_STATE, int8[0:NUM_NL80211_PLINK_STATES]] - NL80211_ATTR_LOCAL_MESH_POWER_MODE nlattr[NL80211_ATTR_LOCAL_MESH_POWER_MODE, int32[NL80211_MESH_POWER_UNKNOWN:NL80211_MESH_POWER_MAX]] + NL80211_ATTR_STA_PLINK_ACTION nlattr[NL80211_ATTR_STA_PLINK_ACTION, int8[0:NUM_NL80211_PLINK_ACTIONS_1]] + NL80211_ATTR_STA_PLINK_STATE nlattr[NL80211_ATTR_STA_PLINK_STATE, int8[0:NUM_NL80211_PLINK_STATES_1]] + NL80211_ATTR_LOCAL_MESH_POWER_MODE nlattr[NL80211_ATTR_LOCAL_MESH_POWER_MODE, int32[1:NL80211_MESH_POWER_MAX]] NL80211_ATTR_OPMODE_NOTIF nlattr[NL80211_ATTR_OPMODE_NOTIF, int8] NL80211_ATTR_AIRTIME_WEIGHT nlattr[NL80211_ATTR_AIRTIME_WEIGHT, int16] NL80211_ATTR_STA_TX_POWER_SETTING nlattr[NL80211_ATTR_STA_TX_POWER_SETTING, int8[NL80211_TX_POWER_AUTOMATIC:NL80211_TX_POWER_FIXED]] @@ -247,6 +247,9 @@ nl80211_policy_station [ NL80211_ATTR_STA_VLAN nlattr[NL80211_ATTR_STA_VLAN, ifindex] ] [varlen] +define NUM_NL80211_PLINK_ACTIONS_1 NUM_NL80211_PLINK_ACTIONS - 1 +define NUM_NL80211_PLINK_STATES_1 NUM_NL80211_PLINK_STATES - 1 + ieee80211_mgmt_subtype = 0xa, 0xc sta_flags_policy [ -- cgit mrf-deployment