diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:54:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:54:01 -0500 |
| commit | 0ba6c33bcddc64a54b5f1c25a696c4767dc76292 (patch) | |
| tree | 62e616f97a4762d8e75bf732e4827af2d15d52c5 /include/net/transp_v6.h | |
| parent | 21af0297c7e56024a5ccc4d8ad2a590f9ec371ba (diff) | |
| parent | 85040bcb4643cba578839e953f25e2d1965d83d0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
[IPV6] ADDRLABEL: Fix double free on label deletion.
[PPP]: Sparse warning fixes.
[IPV4] fib_trie: remove unneeded NULL check
[IPV4] fib_trie: More whitespace cleanup.
[NET_SCHED]: Use nla_policy for attribute validation in ematches
[NET_SCHED]: Use nla_policy for attribute validation in actions
[NET_SCHED]: Use nla_policy for attribute validation in classifiers
[NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
[NET_SCHED]: sch_api: introduce constant for rate table size
[NET_SCHED]: Use typeful attribute parsing helpers
[NET_SCHED]: Use typeful attribute construction helpers
[NET_SCHED]: Use NLA_PUT_STRING for string dumping
[NET_SCHED]: Use nla_nest_start/nla_nest_end
[NET_SCHED]: Propagate nla_parse return value
[NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
[NET_SCHED]: act_api: use nlmsg_parse
[NET_SCHED]: act_api: fix netlink API conversion bug
[NET_SCHED]: sch_netem: use nla_parse_nested_compat
[NET_SCHED]: sch_atm: fix format string warning
[NETNS]: Add namespace for ICMP replying code.
...
Diffstat (limited to 'include/net/transp_v6.h')
| -rw-r--r-- | include/net/transp_v6.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h index 409da3a9a455..27394e0447d8 100644 --- a/include/net/transp_v6.h +++ b/include/net/transp_v6.h | |||
| @@ -17,16 +17,20 @@ extern struct proto tcpv6_prot; | |||
| 17 | struct flowi; | 17 | struct flowi; |
| 18 | 18 | ||
| 19 | /* extention headers */ | 19 | /* extention headers */ |
| 20 | extern void ipv6_rthdr_init(void); | 20 | extern int ipv6_exthdrs_init(void); |
| 21 | extern void ipv6_frag_init(void); | 21 | extern void ipv6_exthdrs_exit(void); |
| 22 | extern void ipv6_nodata_init(void); | 22 | extern int ipv6_frag_init(void); |
| 23 | extern void ipv6_destopt_init(void); | 23 | extern void ipv6_frag_exit(void); |
| 24 | 24 | ||
| 25 | /* transport protocols */ | 25 | /* transport protocols */ |
| 26 | extern void rawv6_init(void); | 26 | extern int rawv6_init(void); |
| 27 | extern void udpv6_init(void); | 27 | extern void rawv6_exit(void); |
| 28 | extern void udplitev6_init(void); | 28 | extern int udpv6_init(void); |
| 29 | extern void tcpv6_init(void); | 29 | extern void udpv6_exit(void); |
| 30 | extern int udplitev6_init(void); | ||
| 31 | extern void udplitev6_exit(void); | ||
| 32 | extern int tcpv6_init(void); | ||
| 33 | extern void tcpv6_exit(void); | ||
| 30 | 34 | ||
| 31 | extern int udpv6_connect(struct sock *sk, | 35 | extern int udpv6_connect(struct sock *sk, |
| 32 | struct sockaddr *uaddr, | 36 | struct sockaddr *uaddr, |