diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 10:59:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 10:59:48 -0800 |
| commit | 29ac0052ea454871273a1fc7ef09a97f3c214ee6 (patch) | |
| tree | 40441a8ec1f34b508ae1cc4bb91f9fabad4889e9 /include | |
| parent | f3656b9a2740ebdff123b30b6b806648c9f189f8 (diff) | |
| parent | 4aa9cb320e8081fbaec0c10eb0e077c8ca4d1ad9 (diff) | |
| download | op-kernel-dev-29ac0052ea454871273a1fc7ef09a97f3c214ee6.zip op-kernel-dev-29ac0052ea454871273a1fc7ef09a97f3c214ee6.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[AF_RXRPC]: Add a missing goto
[VLAN]: Lost rtnl_unlock() in vlan_ioctl()
[SCTP]: Fix the bind_addr info during migration.
[SCTP]: Add bind hash locking to the migrate code
[IPV4]: Remove prototype of ip_rt_advice
[IPv4]: Reply net unreachable ICMP message
[IPv6] SNMP: Increment OutNoRoutes when connecting to unreachable network
[BRIDGE]: Section fix.
[NIU]: Fix link LED handling.
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/route.h | 1 | ||||
| -rw-r--r-- | include/net/sctp/structs.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/net/route.h b/include/net/route.h index f7ce625..59b0b19 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -109,7 +109,6 @@ struct in_device; extern int ip_rt_init(void); extern void ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw, __be32 src, struct net_device *dev); -extern void ip_rt_advice(struct rtable **rp, int advice); extern void rt_cache_flush(int how); extern int __ip_route_output_key(struct rtable **, const struct flowi *flp); extern int ip_route_output_key(struct rtable **, struct flowi *flp); diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index eb3113c..002a00a 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -1184,6 +1184,9 @@ int sctp_bind_addr_copy(struct sctp_bind_addr *dest, const struct sctp_bind_addr *src, sctp_scope_t scope, gfp_t gfp, int flags); +int sctp_bind_addr_dup(struct sctp_bind_addr *dest, + const struct sctp_bind_addr *src, + gfp_t gfp); int sctp_add_bind_addr(struct sctp_bind_addr *, union sctp_addr *, __u8 use_as_src, gfp_t gfp); int sctp_del_bind_addr(struct sctp_bind_addr *, union sctp_addr *); |
