Skip to contentSkip to conversation

ndisc: Pass net_device to ndisc_fill_addr_option().

RFC PATCH In review YOSHIFUJI Hideaki 1 participant 1 message Jan 12, 2013

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

YOSHIFUJI Hideaki

author
#0 lore raw

RFC PATCH 2/6 ndisc: Pass net_device to ndisc_fill_addr_option().

In addition to reduction of number of arguments, this will be used by upcoming IEEE1394 code.

CC Stephan Gatzka <[email protected]>
CC Stefan Richter <[email protected]>
Signed-off-by YOSHIFUJI Hideaki <[email protected]>
---
 net/ipv6/ndisc.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
net/ipv6/ndisc.c +6 -6
index 80c077c..99cd286 100644
@@ -143,10 +143,11 @@ struct neigh_table nd_tbl = {
 	.gc_thresh3 =	1024,
 };
 
-static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data, int data_len,
-				  unsigned short addr_type)
+static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data,
+				  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);
 
 	opt[0] = type;

@@ -415,8 +416,7 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev,
 	}
 
 	if (llinfo)
-		ndisc_fill_addr_option(opt, llinfo, dev->dev_addr,
-				       dev->addr_len, dev->type);
+		ndisc_fill_addr_option(opt, llinfo, dev->dev_addr, dev);
 
 	hdr->icmp6_cksum = csum_ipv6_magic(saddr, daddr, len,
 					   IPPROTO_ICMPV6,

@@ -1469,7 +1469,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
 
 	if (ha)
 		opt = ndisc_fill_addr_option(opt, ND_OPT_TARGET_LL_ADDR, ha,
-					     dev->addr_len, dev->type);
+					     dev);
 
 	/*
 	 *	build redirect option and copy skb over to the new packet.
Signature · 1 line
1.7.9.5