| Message ID | 20200825032517.61864-1-linmiaohe@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2] netlink: remove duplicated nla_need_padding_for_64bit() check | expand |
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.
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); }
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(-)