---

yaml
---
r: 351507
b: refs/heads/master
c: 315ff09
h: refs/heads/master
i:
  351505: e93a4f1
  351503: 2bcb9a8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7373470202a3c98e1a338bf1acf51247cd100868
+refs/heads/master: 315ff09dbaebc6061948102d7ed8781d4ee46f36

trunk/net/ipv6/ndisc.c

@@ -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));
 }
 
-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;
@@ -420,8 +421,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,8 +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);
+		opt = ndisc_fill_addr_option(opt, ND_OPT_TARGET_LL_ADDR, ha, dev);
 
 	/*
 	 *	build redirect option and copy skb over to the new packet.