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

netlink: Remove netlink_compare_arg.trailer

Browse Source 
Instead of computing the offset from trailer, this patch computes
netlink_compare_arg_len from the offset of portid and then adds 4
to it.  This allows trailer to be removed.

Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2015-03-21 14:14:03 +11:00 committed by David S. Miller
parent 69a3b16ff6
commit 8f2ddaac30
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/netlink/af_netlink.c
View File

@ -974,10 +974,11 @@ struct netlink_compare_arg
{ {
possible_net_t pnet; possible_net_t pnet;
u32 portid; u32 portid;
char trailer[];
}; };
#define netlink_compare_arg_len offsetof(struct netlink_compare_arg, trailer) /* Doing sizeof directly may yield 4 extra bytes on 64-bit. */
#define netlink_compare_arg_len \
(offsetof(struct netlink_compare_arg, portid) + sizeof(u32))
static inline int netlink_compare(struct rhashtable_compare_arg *arg, static inline int netlink_compare(struct rhashtable_compare_arg *arg,
const void *ptr) const void *ptr)