Message ID | 20160615192027.4064-5-aar@pengutronix.de (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On 15.06.2016 21:20, Alexander Aring wrote: > 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> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> [note, patchworks picks up the acks automatically, you don't need to repost] Thanks, Hannes -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 2d8edaa..4cee826 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -127,10 +127,15 @@ 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 + - ndisc_addr_option_pad(dev->type)); + return __ndisc_opt_addr_space(dev->addr_len, + ndisc_addr_option_pad(dev->type)); } static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p,