Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351519
b: refs/heads/master
c: 5f5a011
h: refs/heads/master
i:
  351517: a0316bb
  351515: 5c85edf
  351511: d0472e3
  351503: 2bcb9a8
  351487: 2145518
v: v3
  • Loading branch information
YOSHIFUJI Hideaki / 吉藤英明 authored and David S. Miller committed Jan 21, 2013
1 parent e76b9a8 commit e04655d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ce13576144ade3e9340efce9620a6dd338aedc7
refs/heads/master: 5f5a0115635bf678d267cbc72169a718e8724d03
33 changes: 15 additions & 18 deletions trunk/net/ipv6/ndisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down Expand Up @@ -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));
Expand All @@ -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,
Expand Down Expand Up @@ -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,
int rd_len)
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)
Expand All @@ -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;
Expand Down Expand Up @@ -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));
Expand All @@ -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,
Expand Down

0 comments on commit e04655d

Please sign in to comment.