diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/net/addrconf.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/net/addrconf.h')
| -rw-r--r-- | include/net/addrconf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index c216de528b08..7b55ab215a64 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
| @@ -88,8 +88,8 @@ extern int ipv6_dev_get_saddr(struct net *net, | |||
| 88 | extern int ipv6_get_lladdr(struct net_device *dev, | 88 | extern int ipv6_get_lladdr(struct net_device *dev, |
| 89 | struct in6_addr *addr, | 89 | struct in6_addr *addr, |
| 90 | unsigned char banned_flags); | 90 | unsigned char banned_flags); |
| 91 | extern int ipv6_rcv_saddr_equal(const struct sock *sk, | 91 | extern int ipv6_rcv_saddr_equal(const struct sock *sk, |
| 92 | const struct sock *sk2); | 92 | const struct sock *sk2); |
| 93 | extern void addrconf_join_solict(struct net_device *dev, | 93 | extern void addrconf_join_solict(struct net_device *dev, |
| 94 | struct in6_addr *addr); | 94 | struct in6_addr *addr); |
| 95 | extern void addrconf_leave_solict(struct inet6_dev *idev, | 95 | extern void addrconf_leave_solict(struct inet6_dev *idev, |