diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 04:37:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 04:37:16 -0500 |
| commit | 167c6274c30d17c41742096d1a12c32bd3b7e366 (patch) | |
| tree | b28b98e34dd2b98db6fff8459cddbc65142cd891 /include/net | |
| parent | 5c7f0333584128c745fbda845abbe3a32c22d467 (diff) | |
| parent | a8272061fe533f6d0261b38c58c93bd0855baebe (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ndisc.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 11dd0137c6a5..ce532f2222ce 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h | |||
| @@ -108,6 +108,20 @@ extern void ndisc_send_redirect(struct sk_buff *skb, | |||
| 108 | 108 | ||
| 109 | extern int ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir); | 109 | extern int ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir); |
| 110 | 110 | ||
| 111 | extern struct sk_buff *ndisc_build_skb(struct net_device *dev, | ||
| 112 | const struct in6_addr *daddr, | ||
| 113 | const struct in6_addr *saddr, | ||
| 114 | struct icmp6hdr *icmp6h, | ||
| 115 | const struct in6_addr *target, | ||
| 116 | int llinfo); | ||
| 117 | |||
| 118 | extern void ndisc_send_skb(struct sk_buff *skb, | ||
| 119 | struct net_device *dev, | ||
| 120 | struct neighbour *neigh, | ||
| 121 | const struct in6_addr *daddr, | ||
| 122 | const struct in6_addr *saddr, | ||
| 123 | struct icmp6hdr *icmp6h); | ||
| 124 | |||
| 111 | 125 | ||
| 112 | 126 | ||
| 113 | /* | 127 | /* |