diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 10:41:22 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 10:41:26 -0400 |
| commit | 7c5f13519a67aa7ba3a99155f128d4bdef87d087 (patch) | |
| tree | e4d0537092930a53a85932de83a7861990c58607 /include/net/addrconf.h | |
| parent | 5e62feabcc3e4127a084701ec54ffe891985b7e8 (diff) | |
| parent | 021989622810b02aab4b24f91e1f5ada2b654579 (diff) | |
Merge branch 'x86/urgent' of into irq/sparseirq
Reason: Pull in the latest io_apic bugfixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 45375b41a2a0..4d40c4d0230b 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
| @@ -121,6 +121,7 @@ static inline int addrconf_finite_timeout(unsigned long timeout) | |||
| 121 | * IPv6 Address Label subsystem (addrlabel.c) | 121 | * IPv6 Address Label subsystem (addrlabel.c) |
| 122 | */ | 122 | */ |
| 123 | extern int ipv6_addr_label_init(void); | 123 | extern int ipv6_addr_label_init(void); |
| 124 | extern void ipv6_addr_label_cleanup(void); | ||
| 124 | extern void ipv6_addr_label_rtnl_register(void); | 125 | extern void ipv6_addr_label_rtnl_register(void); |
| 125 | extern u32 ipv6_addr_label(struct net *net, | 126 | extern u32 ipv6_addr_label(struct net *net, |
| 126 | const struct in6_addr *addr, | 127 | const struct in6_addr *addr, |