lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ndisc: Reduce number of arguments for ndisc_fill_addr_option().

Browse Source 
Add pointer to struct net_device (dev) and remove
data_len (= dev->addr_len) and addr_type (= dev->type).

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:50 +00:00
committed by David S. Miller
parent 7373470202
commit 315ff09dba
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/ipv6/ndisc.c
View File

@@ -148,10 +148,11 @@ 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_SPACE(dev->addr_len + ndisc_addr_option_pad(dev->type));
} }
static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data, int data_len, static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data,
unsigned short addr_type) struct net_device *dev)
{ {
int pad = ndisc_addr_option_pad(addr_type); 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_SPACE(data_len + pad);
opt[0] = type; opt[0] = type;
@@ -420,8 +421,7 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev,
} }
if (llinfo) if (llinfo)
ndisc_fill_addr_option(opt, llinfo, dev->dev_addr, ndisc_fill_addr_option(opt, llinfo, dev->dev_addr, dev);
dev->addr_len, dev->type);
hdr->icmp6_cksum = csum_ipv6_magic(saddr, daddr, len, hdr->icmp6_cksum = csum_ipv6_magic(saddr, daddr, len,
IPPROTO_ICMPV6, IPPROTO_ICMPV6,
@@ -1469,8 +1469,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
*/ */
if (ha) if (ha)
opt = ndisc_fill_addr_option(opt, ND_OPT_TARGET_LL_ADDR, ha, opt = ndisc_fill_addr_option(opt, ND_OPT_TARGET_LL_ADDR, ha, dev);
dev->addr_len, dev->type);
/* /*
* build redirect option and copy skb over to the new packet. * build redirect option and copy skb over to the new packet.