The following commit has been merged in the batman-adv/next branch: commit 1f07b62f3205f6ed41759df2892eaf433bc051a1 Author: Cong Wang amwang@redhat.com Date: Wed Aug 15 18:18:11 2012 +0800

sctp: fix a compile error in sctp.h

I got the following compile error:

In file included from include/net/sctp/checksum.h:46:0, from net/ipv4/netfilter/nf_nat_proto_sctp.c:14: include/net/sctp/sctp.h: In function ‘sctp_dbg_objcnt_init’: include/net/sctp/sctp.h:370:88: error: parameter name omitted include/net/sctp/sctp.h: In function ‘sctp_dbg_objcnt_exit’: include/net/sctp/sctp.h:371:88: error: parameter name omitted

which is caused by

commit 13d782f6b4fbbaf9d0380a9947deb45a9de46ae7 Author: Eric W. Biederman ebiederm@xmission.com Date: Mon Aug 6 08:45:15 2012 +0000

sctp: Make the proc files per network namespace.

This patch could fix it.

Cc: David S. Miller davem@davemloft.net Cc: "Eric W. Biederman" ebiederm@xmission.com Signed-off-by: Cong Wang amwang@redhat.com Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index aaa8292..9c6414f 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -367,8 +367,8 @@ void sctp_dbg_objcnt_exit(struct net *); #define SCTP_DBG_OBJCNT_INC(name) #define SCTP_DBG_OBJCNT_DEC(name)

-static inline void sctp_dbg_objcnt_init(struct net *) { return; } -static inline void sctp_dbg_objcnt_exit(struct net *) { return; } +static inline void sctp_dbg_objcnt_init(struct net *net) { return; } +static inline void sctp_dbg_objcnt_exit(struct net *net) { return; }

#endif /* CONFIG_SCTP_DBG_OBJCOUNT */