Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ndisc: Move ndisc_opt_addr_space() to include/net/ndisc.h.

Browse source 
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:
YOSHIFUJI Hideaki / 吉藤英明 2013-01-21 06:47:56 +00:00 committed by David S. Miller
parent 315ff09dba
commit c558e9fca8
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/net/ndisc.h
View file

@ -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;
}

7
net/ipv6/ndisc.c
View file

@ -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;