| Message ID | 1345025891-5021-1-git-send-email-amwang@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
David Miller <davem@davemloft.net> writes: > From: Cong Wang <amwang@redhat.com> > Date: Wed, 15 Aug 2012 18:18:11 +0800 > >> 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> > > Applied thanks. > > I appended the SCTP debug objcnt procfs netns conversions by hand > since Eric didn't handle it in his commit. > > Eric, please turn all relevant options both on and off when testing > the build of your patches. Thanks. Grr. My apologies. It looks like that one slipped by me this time :( Eric -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 */
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> --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html