Commit 8f2ddaac authored Mar 21, 2015 by Herbert Xu Committed by David S. Miller Mar 21, 2015

netlink: Remove netlink_compare_arg.trailer



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>

parent 69a3b16f

net/netlink/af_netlink.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -974,10 +974,11 @@ struct netlink_compare_arg
		{
		possible_net_t pnet;
		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,
		const void *ptr)