| From bc0435855041d7fff0b83dd992fc4be34aa11afb Mon Sep 17 00:00:00 2001 |
| From: Johannes Berg <johannes.berg@intel.com> |
| Date: Tue, 18 Aug 2020 10:17:32 +0200 |
| Subject: 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: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| --- |
| drivers/net/macsec.c | 2 +- |
| drivers/net/wireguard/netlink.c | 4 ++-- |
| net/wireless/nl80211.c | 6 +++--- |
| 3 files changed, 6 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/net/macsec.c |
| +++ b/drivers/net/macsec.c |
| @@ -1608,7 +1608,7 @@ static const struct nla_policy macsec_ge |
| 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, |
| --- a/net/wireless/nl80211.c |
| +++ b/net/wireless/nl80211.c |
| @@ -676,7 +676,7 @@ nl80211_wowlan_tcp_policy[NUM_NL80211_WO |
| }, |
| [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) |
| }, |
| @@ -684,8 +684,8 @@ nl80211_wowlan_tcp_policy[NUM_NL80211_WO |
| .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 */ |
| |