lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ../net-2.6/

Browse Source 
Conflicts:

	net/ipv6/ndisc.c
This commit is contained in:
David S. Miller
2008-03-23 22:54:03 -07:00
parent 9bd512f619 8f3ea33a50
commit 06802a819a
12 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/sctp/sctp.h
View File

@@ -384,7 +384,7 @@ void sctp_v6_del_protocol(void);
#else /* #ifdef defined(CONFIG_IPV6) */
static inline void sctp_v6_pf_init(void) { return 0; }
static inline void sctp_v6_pf_init(void) { return; }
static inline void sctp_v6_pf_exit(void) { return; }
static inline int sctp_v6_protosw_init(void) { return 0; }
static inline void sctp_v6_protosw_exit(void) { return; }