Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f5a0115 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

ndisc: Make ndisc_fill_xxx_option() for sk_buff. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ce13576

net/ipv6/ndisc.c

+15 −18
Original line number Diff line number Diff line
@@ -143,12 +143,12 @@ struct neigh_table nd_tbl = { 
	.gc_thresh3 =	1024,

};



static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data,

				  struct net_device *dev)

static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data)

{

	int pad   = ndisc_addr_option_pad(dev->type);

	int data_len = dev->addr_len;

	int space = ndisc_opt_addr_space(dev);

	int pad   = ndisc_addr_option_pad(skb->dev->type);

	int data_len = skb->dev->addr_len;

	int space = ndisc_opt_addr_space(skb->dev);

	u8 *opt = skb_put(skb, space);



	opt[0] = type;

	opt[1] = space>>3;
@@ -162,7 +162,6 @@ static u8 *ndisc_fill_addr_option(u8 *opt, int type, void *data, 
	opt += data_len;

	if ((space -= data_len) > 0)

		memset(opt, 0, space);

	return opt + space;

}



static struct nd_opt_hdr *ndisc_next_option(struct nd_opt_hdr *cur,
@@ -440,7 +439,7 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev, 
	if (!skb)

		return NULL;



	skb_put(skb, len + optlen);

	skb_put(skb, len);



	hdr = (struct icmp6hdr *)skb_transport_header(skb);

	memcpy(hdr, icmp6h, sizeof(*hdr));
@@ -452,7 +451,7 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev, 
	}



	if (llinfo)

		ndisc_fill_addr_option(opt, llinfo, dev->dev_addr, dev);

		ndisc_fill_addr_option(skb, llinfo, dev->dev_addr);



	hdr->icmp6_cksum = csum_ipv6_magic(saddr, daddr, skb->len,

					   IPPROTO_ICMPV6,
@@ -1379,17 +1378,18 @@ static void ndisc_redirect_rcv(struct sk_buff *skb) 
	icmpv6_notify(skb, NDISC_REDIRECT, 0, 0);

}



static u8 *ndisc_fill_redirect_hdr_option(u8 *opt, struct sk_buff *orig_skb,

static void ndisc_fill_redirect_hdr_option(struct sk_buff *skb,

					   struct sk_buff *orig_skb,

					   int rd_len)

{

	u8 *opt = skb_put(skb, rd_len);



	memset(opt, 0, 8);

	*(opt++) = ND_OPT_REDIRECT_HDR;

	*(opt++) = (rd_len >> 3);

	opt += 6;



	memcpy(opt, ipv6_hdr(orig_skb), rd_len - 8);



	return opt + rd_len - 8;

}



void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
@@ -1406,7 +1406,6 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) 
	struct dst_entry *dst;

	struct inet6_dev *idev;

	struct flowi6 fl6;

	u8 *opt;

	int rd_len;

	int err;

	u8 ha_buf[MAX_ADDR_LEN], *ha = NULL;
@@ -1481,7 +1480,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) 
	if (!buff)

		goto release;



	skb_put(buff, sizeof(*msg) + optlen);

	skb_put(buff, sizeof(*msg));

	msg = (struct rd_msg *)icmp6_hdr(buff);



	memset(&msg->icmph, 0, sizeof(struct icmp6hdr));
@@ -1494,21 +1493,19 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) 
	msg->target = *target;

	msg->dest = ipv6_hdr(skb)->daddr;



	opt = msg->opt;



	/*

	 *	include target_address option

	 */



	if (ha)

		opt = ndisc_fill_addr_option(opt, ND_OPT_TARGET_LL_ADDR, ha, dev);

		ndisc_fill_addr_option(skb, ND_OPT_TARGET_LL_ADDR, ha);



	/*

	 *	build redirect option and copy skb over to the new packet.

	 */



	if (rd_len)

		opt = ndisc_fill_redirect_hdr_option(opt, skb, rd_len);

		ndisc_fill_redirect_hdr_option(buff, skb, rd_len);



	msg->icmph.icmp6_cksum = csum_ipv6_magic(&saddr_buf, &ipv6_hdr(skb)->saddr,

						 buff->len, IPPROTO_ICMPV6,