* [PATCH v2] netlink: remove duplicated nla_need_padding_for_64bit() check
@ 2020-08-25 3:25 Miaohe Lin
2020-08-25 13:06 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Miaohe Lin @ 2020-08-25 3:25 UTC (permalink / raw)
To: davem, johannes.berg; +Cc: netdev, linux-kernel, linmiaohe
The need for padding 64bit is implicitly checked by nla_align_64bit(), so
remove this explicit one.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
lib/nlattr.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/nlattr.c b/lib/nlattr.c
index bc5b5cf608c4..98f596bfbfd8 100644
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@ -816,8 +816,7 @@ EXPORT_SYMBOL(__nla_reserve);
struct nlattr *__nla_reserve_64bit(struct sk_buff *skb, int attrtype,
int attrlen, int padattr)
{
- if (nla_need_padding_for_64bit(skb))
- nla_align_64bit(skb, padattr);
+ nla_align_64bit(skb, padattr);
return __nla_reserve(skb, attrtype, attrlen);
}
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] netlink: remove duplicated nla_need_padding_for_64bit() check
2020-08-25 3:25 [PATCH v2] netlink: remove duplicated nla_need_padding_for_64bit() check Miaohe Lin
@ 2020-08-25 13:06 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-08-25 13:06 UTC (permalink / raw)
To: linmiaohe; +Cc: johannes.berg, netdev, linux-kernel
From: Miaohe Lin <linmiaohe@huawei.com>
Date: Mon, 24 Aug 2020 23:25:17 -0400
> The need for padding 64bit is implicitly checked by nla_align_64bit(), so
> remove this explicit one.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Also applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-25 13:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-25 3:25 [PATCH v2] netlink: remove duplicated nla_need_padding_for_64bit() check Miaohe Lin
2020-08-25 13:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).