ndisc: Move ndisc_opt_addr_space() to include/net/ndisc.h.
This also makes ndisc_opt_addr_data() and ndisc_fill_addr_option() use ndisc_opt_addr_space(). Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
315ff09dba
Коммит
c558e9fca8
|
@ -127,13 +127,19 @@ static int ndisc_addr_option_pad(unsigned short type)
|
|||
}
|
||||
}
|
||||
|
||||
static inline int ndisc_opt_addr_space(struct net_device *dev)
|
||||
{
|
||||
return NDISC_OPT_SPACE(dev->addr_len +
|
||||
ndisc_addr_option_pad(dev->type));
|
||||
}
|
||||
|
||||
static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p,
|
||||
struct net_device *dev)
|
||||
{
|
||||
u8 *lladdr = (u8 *)(p + 1);
|
||||
int lladdrlen = p->nd_opt_len << 3;
|
||||
int prepad = ndisc_addr_option_pad(dev->type);
|
||||
if (lladdrlen != NDISC_OPT_SPACE(dev->addr_len + prepad))
|
||||
if (lladdrlen != ndisc_opt_addr_space(dev))
|
||||
return NULL;
|
||||
return lladdr + prepad;
|
||||
}
|
||||
|
|
|
@ -143,17 +143,12 @@ struct neigh_table nd_tbl = {
|
|||
.gc_thresh3 = 1024,
|
||||
};
|
||||
|
||||
static inline int ndisc_opt_addr_space(struct net_device *dev)
|
||||
{
|
||||
return NDISC_OPT_SPACE(dev->addr_len + ndisc_addr_option_pad(dev->type));
|
||||
}
|
||||
|
||||
static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data,
|
||||
struct net_device *dev)
|
||||
{
|
||||
int pad = ndisc_addr_option_pad(dev->type);
|
||||
int data_len = dev->addr_len;
|
||||
int space = NDISC_OPT_SPACE(data_len + pad);
|
||||
int space = ndisc_opt_addr_space(dev);
|
||||
|
||||
opt[0] = type;
|
||||
opt[1] = space>>3;
|
||||
|
|
Загрузка…
Ссылка в новой задаче