diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-25 07:11:52 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-25 07:11:52 -0400 |
| commit | 346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8 (patch) | |
| tree | 0e824d68b72969127abcad85e82b468ed4e23237 /include/net/addrconf.h | |
| parent | 5caf6ae5ce880ec15448b310e47a9515ebb7e808 (diff) | |
| parent | 4f0eb5d7efe375859b15c97f453113a242bf057b (diff) | |
Merge tag 'phy-for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
Adds 3 new PHY drivers stih407, stih41x and rcar gen2 PHY. It also
includes miscellaneous cleanup of other PHY drivers.
Conflicts:
MAINTAINERS
Diffstat (limited to 'include/net/addrconf.h')
| -rw-r--r-- | include/net/addrconf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index f679877bb601..ec51e673b4b6 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
| @@ -204,6 +204,7 @@ void ipv6_sock_ac_close(struct sock *sk); | |||
| 204 | 204 | ||
| 205 | int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr); | 205 | int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr); |
| 206 | int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr); | 206 | int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr); |
| 207 | void ipv6_ac_destroy_dev(struct inet6_dev *idev); | ||
| 207 | bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev, | 208 | bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev, |
| 208 | const struct in6_addr *addr); | 209 | const struct in6_addr *addr); |
| 209 | bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev, | 210 | bool ipv6_chk_acast_addr_src(struct net *net, struct net_device *dev, |