Commit 1e82f961 authored Jun 15, 2016 by Alexander Aring Committed by David S. Miller Jun 15, 2016

ndisc: add __ndisc_opt_addr_space function

This patch adds __ndisc_opt_addr_space as low-level function for
ndisc_opt_addr_space which doesn't depend on net_device parameter.

Cc: David S. Miller <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: James Morris <jmorris@namei.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Patrick McHardy <kaber@trash.net>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Alexander Aring <aar@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 848484c9

include/net/ndisc.h

+7 −2

Original line number	Diff line number	Diff line
		@@ -127,9 +127,14 @@ static inline int ndisc_addr_option_pad(unsigned short type)
		}
		}

		static inline int __ndisc_opt_addr_space(unsigned char addr_len, int pad)
		{
		return NDISC_OPT_SPACE(addr_len + pad);
		}

		static inline int ndisc_opt_addr_space(struct net_device *dev)
		{
		return NDISC_OPT_SPACE(dev->addr_len +
		return __ndisc_opt_addr_space(dev->addr_len,
		ndisc_addr_option_pad(dev->type));
		}

Admin message