iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: fix HAVE_EFFICIENT_UNALIGNED_ACCESS typos

Browse Source 
HAVE_EFFICIENT_UNALIGNED_ACCESS needs CONFIG_ prefix.

Also add a comment in nla_align_64bit() explaining we have
to add a padding if current skb->data is aligned, as it
certainly can be confusing.

Fixes: 35c5845957 ("net: Add helpers for 64-bit aligning netlink attributes.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2016-04-20 07:31:31 -07:00 committed by David S. Miller
parent b84e93077f
commit cca1d81574
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/net/netlink.h
View File

@ -1238,18 +1238,21 @@ static inline int nla_validate_nested(const struct nlattr *start, int maxtype,
* Conditionally emit a padding netlink attribute in order to make * Conditionally emit a padding netlink attribute in order to make
* the next attribute we emit have a 64-bit aligned nla_data() area. * the next attribute we emit have a 64-bit aligned nla_data() area.
* This will only be done in architectures which do not have * This will only be done in architectures which do not have
* HAVE_EFFICIENT_UNALIGNED_ACCESS defined. * CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS defined.
* *
* Returns zero on success or a negative error code. * Returns zero on success or a negative error code.
*/ */
static inline int nla_align_64bit(struct sk_buff *skb, int padattr) static inline int nla_align_64bit(struct sk_buff *skb, int padattr)
{ {
#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
if (IS_ALIGNED((unsigned long)skb->data, 8)) { /* The nlattr header is 4 bytes in size, that's why we test
struct nlattr *attr = nla_reserve(skb, padattr, 0); * if the skb->data _is_ aligned. This NOP attribute, plus
if (!attr) * nlattr header for next attribute, will make nla_data()
* 8-byte aligned.
*/
if (IS_ALIGNED((unsigned long)skb->data, 8) &&
!nla_reserve(skb, padattr, 0))
return -EMSGSIZE; return -EMSGSIZE;
}
#endif #endif
return 0; return 0;
} }
@ -1261,7 +1264,7 @@ static inline int nla_align_64bit(struct sk_buff *skb, int padattr)
static inline int nla_total_size_64bit(int payload) static inline int nla_total_size_64bit(int payload)
{ {
return NLA_ALIGN(nla_attr_size(payload)) return NLA_ALIGN(nla_attr_size(payload))
#ifndef HAVE_EFFICIENT_UNALIGNED_ACCESS #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+ NLA_ALIGN(nla_attr_size(0)) + NLA_ALIGN(nla_attr_size(0))
#endif #endif
; ;