Commit bc043585 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

netlink: consistently use NLA_POLICY_MIN_LEN() 



Change places that open-code NLA_POLICY_MIN_LEN() to
use the macro instead, giving us flexibility in how we
handle the details of the macro.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8140860c

drivers/net/macsec.c

+1 −1
Original line number Diff line number Diff line
@@ -1611,7 +1611,7 @@ static const struct nla_policy macsec_genl_rxsc_policy[NUM_MACSEC_RXSC_ATTR] = { 
static const struct nla_policy macsec_genl_sa_policy[NUM_MACSEC_SA_ATTR] = {

	[MACSEC_SA_ATTR_AN] = { .type = NLA_U8 },

	[MACSEC_SA_ATTR_ACTIVE] = { .type = NLA_U8 },

	[MACSEC_SA_ATTR_PN] = { .type = NLA_MIN_LEN, .len = 4 },

	[MACSEC_SA_ATTR_PN] = NLA_POLICY_MIN_LEN(4),

	[MACSEC_SA_ATTR_KEYID] = { .type = NLA_BINARY,

				   .len = MACSEC_KEYID_LEN, },

	[MACSEC_SA_ATTR_KEY] = { .type = NLA_BINARY,

drivers/net/wireguard/netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = { 
	[WGPEER_A_PUBLIC_KEY]				= NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN),

	[WGPEER_A_PRESHARED_KEY]			= NLA_POLICY_EXACT_LEN(NOISE_SYMMETRIC_KEY_LEN),

	[WGPEER_A_FLAGS]				= { .type = NLA_U32 },

	[WGPEER_A_ENDPOINT]				= { .type = NLA_MIN_LEN, .len = sizeof(struct sockaddr) },

	[WGPEER_A_ENDPOINT]				= NLA_POLICY_MIN_LEN(sizeof(struct sockaddr)),

	[WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL]	= { .type = NLA_U16 },

	[WGPEER_A_LAST_HANDSHAKE_TIME]			= NLA_POLICY_EXACT_LEN(sizeof(struct __kernel_timespec)),

	[WGPEER_A_RX_BYTES]				= { .type = NLA_U64 },
@@ -45,7 +45,7 @@ static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = { 


static const struct nla_policy allowedip_policy[WGALLOWEDIP_A_MAX + 1] = {

	[WGALLOWEDIP_A_FAMILY]		= { .type = NLA_U16 },

	[WGALLOWEDIP_A_IPADDR]		= { .type = NLA_MIN_LEN, .len = sizeof(struct in_addr) },

	[WGALLOWEDIP_A_IPADDR]		= NLA_POLICY_MIN_LEN(sizeof(struct in_addr)),

	[WGALLOWEDIP_A_CIDR_MASK]	= { .type = NLA_U8 }

};

net/wireless/nl80211.c

+3 −3
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ nl80211_wowlan_tcp_policy[NUM_NL80211_WOWLAN_TCP] = { 
	[NL80211_WOWLAN_TCP_DST_MAC] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),

	[NL80211_WOWLAN_TCP_SRC_PORT] = { .type = NLA_U16 },

	[NL80211_WOWLAN_TCP_DST_PORT] = { .type = NLA_U16 },

	[NL80211_WOWLAN_TCP_DATA_PAYLOAD] = { .type = NLA_MIN_LEN, .len = 1 },

	[NL80211_WOWLAN_TCP_DATA_PAYLOAD] = NLA_POLICY_MIN_LEN(1),

	[NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ] = {

		.len = sizeof(struct nl80211_wowlan_tcp_data_seq)

	},
@@ -709,8 +709,8 @@ nl80211_wowlan_tcp_policy[NUM_NL80211_WOWLAN_TCP] = { 
		.len = sizeof(struct nl80211_wowlan_tcp_data_token)

	},

	[NL80211_WOWLAN_TCP_DATA_INTERVAL] = { .type = NLA_U32 },

	[NL80211_WOWLAN_TCP_WAKE_PAYLOAD] = { .type = NLA_MIN_LEN, .len = 1 },

	[NL80211_WOWLAN_TCP_WAKE_MASK] = { .type = NLA_MIN_LEN, .len = 1 },

	[NL80211_WOWLAN_TCP_WAKE_PAYLOAD] = NLA_POLICY_MIN_LEN(1),

	[NL80211_WOWLAN_TCP_WAKE_MASK] = NLA_POLICY_MIN_LEN(1),

};

#endif /* CONFIG_PM */