| Message ID | 20160614115239.17788-6-aar@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Alexander Aring wrote: > This patch adds __ndisc_opt_addr_data as low-level function for > ndisc_opt_addr_data 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> > Signed-off-by: Alexander Aring <aar@pengutronix.de> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> > --- > include/net/ndisc.h | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/include/net/ndisc.h b/include/net/ndisc.h > index 4cee826..c8962ad 100644 > --- a/include/net/ndisc.h > +++ b/include/net/ndisc.h > @@ -138,17 +138,23 @@ static inline int ndisc_opt_addr_space(struct net_device *dev) > ndisc_addr_option_pad(dev->type)); > } > > -static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, > - struct net_device *dev) > +static inline u8 *__ndisc_opt_addr_data(struct nd_opt_hdr *p, > + unsigned char addr_len, int prepad) > { > u8 *lladdr = (u8 *)(p + 1); > int lladdrlen = p->nd_opt_len << 3; > - int prepad = ndisc_addr_option_pad(dev->type); > - if (lladdrlen != ndisc_opt_addr_space(dev)) > + if (lladdrlen != __ndisc_opt_addr_space(addr_len, prepad)) > return NULL; > return lladdr + prepad; > } > > +static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, > + struct net_device *dev) > +{ > + return __ndisc_opt_addr_data(p, dev->addr_len, > + ndisc_addr_option_pad(dev->type)); > +} > + > static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, __u32 *hash_rnd) > { > const u32 *p32 = pkey; >
Hello. On 14/06/16 13:52, Alexander Aring wrote: > This patch adds __ndisc_opt_addr_data as low-level function for > ndisc_opt_addr_data 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> > Signed-off-by: Alexander Aring<aar@pengutronix.de> > --- > include/net/ndisc.h | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/include/net/ndisc.h b/include/net/ndisc.h > index 4cee826..c8962ad 100644 > --- a/include/net/ndisc.h > +++ b/include/net/ndisc.h > @@ -138,17 +138,23 @@ static inline int ndisc_opt_addr_space(struct net_device *dev) > ndisc_addr_option_pad(dev->type)); > } > > -static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, > - struct net_device *dev) > +static inline u8 *__ndisc_opt_addr_data(struct nd_opt_hdr *p, > + unsigned char addr_len, int prepad) > { > u8 *lladdr = (u8 *)(p + 1); > int lladdrlen = p->nd_opt_len << 3; > - int prepad = ndisc_addr_option_pad(dev->type); > - if (lladdrlen != ndisc_opt_addr_space(dev)) > + if (lladdrlen != __ndisc_opt_addr_space(addr_len, prepad)) > return NULL; > return lladdr + prepad; > } > > +static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, > + struct net_device *dev) > +{ > + return __ndisc_opt_addr_data(p, dev->addr_len, > + ndisc_addr_option_pad(dev->type)); > +} > + > static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, __u32 *hash_rnd) > { > const u32 *p32 = pkey; Reviewed-by: Stefan Schmidt<stefan@osg.samsung.com> regards Stefan Schmidt -- 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 4cee826..c8962ad 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -138,17 +138,23 @@ static inline int ndisc_opt_addr_space(struct net_device *dev) ndisc_addr_option_pad(dev->type)); } -static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, - struct net_device *dev) +static inline u8 *__ndisc_opt_addr_data(struct nd_opt_hdr *p, + unsigned char addr_len, int prepad) { u8 *lladdr = (u8 *)(p + 1); int lladdrlen = p->nd_opt_len << 3; - int prepad = ndisc_addr_option_pad(dev->type); - if (lladdrlen != ndisc_opt_addr_space(dev)) + if (lladdrlen != __ndisc_opt_addr_space(addr_len, prepad)) return NULL; return lladdr + prepad; } +static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p, + struct net_device *dev) +{ + return __ndisc_opt_addr_data(p, dev->addr_len, + ndisc_addr_option_pad(dev->type)); +} + static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, __u32 *hash_rnd) { const u32 *p32 = pkey;
This patch adds __ndisc_opt_addr_data as low-level function for ndisc_opt_addr_data 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> Signed-off-by: Alexander Aring <aar@pengutronix.de> --- include/net/ndisc.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)