diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 16:07:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 16:07:24 -0400 |
| commit | ca1a6ba57c5fca755b4ac7a13395bca2e2e371b1 (patch) | |
| tree | 1dd8f5090238d644668818c54f9f91b1c5665991 /include | |
| parent | d3073779f8362d64b804882f5f41c208c4a5e11e (diff) | |
| parent | 8f3ea33a5078a09eba12bfe57424507809367756 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sch_htb: fix "too many events" situation
connector: convert to single-threaded workqueue
[ATM]: When proc_create() fails, do some error handling work and return -ENOMEM.
[SUNGEM]: Fix NAPI assertion failure.
BNX2X: prevent ethtool from setting port type
[9P] net/9p/trans_fd.c: remove unused variable
[IPV6] net/ipv6/ndisc.c: remove unused variable
[IPV4] fib_trie: fix warning from rcu_assign_poinger
[TCP]: Let skbs grow over a page on fast peers
[DLCI]: Fix tiny race between module unload and sock_ioctl.
[SCTP]: Fix build warnings with IPV6 disabled.
[IPV4]: Fix null dereference in ip_defrag
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sctp/sctp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 57ed3e323d97..ea806732b084 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -389,7 +389,7 @@ void sctp_v6_del_protocol(void); | |||
| 389 | 389 | ||
| 390 | #else /* #ifdef defined(CONFIG_IPV6) */ | 390 | #else /* #ifdef defined(CONFIG_IPV6) */ |
| 391 | 391 | ||
| 392 | static inline void sctp_v6_pf_init(void) { return 0; } | 392 | static inline void sctp_v6_pf_init(void) { return; } |
| 393 | static inline void sctp_v6_pf_exit(void) { return; } | 393 | static inline void sctp_v6_pf_exit(void) { return; } |
| 394 | static inline int sctp_v6_protosw_init(void) { return 0; } | 394 | static inline int sctp_v6_protosw_init(void) { return 0; } |
| 395 | static inline void sctp_v6_protosw_exit(void) { return; } | 395 | static inline void sctp_v6_protosw_exit(void) { return; } |