* Re: linux-next: Tree for February 1 (ip_vs) [not found] <20110201153403.b3a251a3.sfr@canb.auug.org.au> @ 2011-02-01 17:16 ` Randy Dunlap 2011-02-02 22:31 ` Simon Horman 0 siblings, 1 reply; 3+ messages in thread From: Randy Dunlap @ 2011-02-01 17:16 UTC (permalink / raw) To: Stephen Rothwell, netdev; +Cc: linux-next, LKML On Tue, 1 Feb 2011 15:34:03 +1100 Stephen Rothwell wrote: > Hi all, > > Changes since 20110131: When CONFIG_IP_VS_PROTO_TCP is not set: net/netfilter/ipvs/ip_vs_proto_sctp.c:1104: error: 'struct netns_ipvs' has no member named 'tcp_app_lock' net/netfilter/ipvs/ip_vs_proto_sctp.c:1104: error: 'struct netns_ipvs' has no member named 'tcp_app_lock' --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: Tree for February 1 (ip_vs) 2011-02-01 17:16 ` linux-next: Tree for February 1 (ip_vs) Randy Dunlap @ 2011-02-02 22:31 ` Simon Horman 2011-02-03 7:04 ` Hans Schillstrom 0 siblings, 1 reply; 3+ messages in thread From: Simon Horman @ 2011-02-02 22:31 UTC (permalink / raw) To: Randy Dunlap; +Cc: Stephen Rothwell, netdev, linux-next, LKML On Tue, Feb 01, 2011 at 09:16:20AM -0800, Randy Dunlap wrote: > On Tue, 1 Feb 2011 15:34:03 +1100 Stephen Rothwell wrote: > > > Hi all, > > > > Changes since 20110131: > > > When CONFIG_IP_VS_PROTO_TCP is not set: > > net/netfilter/ipvs/ip_vs_proto_sctp.c:1104: error: 'struct netns_ipvs' has no member named 'tcp_app_lock' > net/netfilter/ipvs/ip_vs_proto_sctp.c:1104: error: 'struct netns_ipvs' has no member named 'tcp_app_lock' Thanks, the following patch should resolve this problem. Hans, could you verify this change? The change is available at git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git master From: Simon Horman <horms@verge.net.au> IPVS: Use correct lock in SCTP module Use sctp_app_lock instead of tcp_app_lock in the SCTP protocol module. This appears to be a typo introduced by the netns changes. Cc: Hans Schillstrom <hans@schillstrom.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c index fb2d04a..b027ccc 100644 --- a/net/netfilter/ipvs/ip_vs_proto_sctp.c +++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c @@ -1101,7 +1101,7 @@ static void __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd) struct netns_ipvs *ipvs = net_ipvs(net); ip_vs_init_hash_table(ipvs->sctp_apps, SCTP_APP_TAB_SIZE); - spin_lock_init(&ipvs->tcp_app_lock); + spin_lock_init(&ipvs->sctp_app_lock); pd->timeout_table = ip_vs_create_timeout_table((int *)sctp_timeouts, sizeof(sctp_timeouts)); } -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: Tree for February 1 (ip_vs) 2011-02-02 22:31 ` Simon Horman @ 2011-02-03 7:04 ` Hans Schillstrom 0 siblings, 0 replies; 3+ messages in thread From: Hans Schillstrom @ 2011-02-03 7:04 UTC (permalink / raw) To: Simon Horman Cc: Randy Dunlap, Stephen Rothwell, netdev, linux-next@vger.kernel.org, LKML On Wed, 2011-02-02 at 23:31 +0100, Simon Horman wrote: > On Tue, Feb 01, 2011 at 09:16:20AM -0800, Randy Dunlap wrote: > > On Tue, 1 Feb 2011 15:34:03 +1100 Stephen Rothwell wrote: > > > > > Hi all, > > > > > > Changes since 20110131: > > > > > > When CONFIG_IP_VS_PROTO_TCP is not set: > > > > net/netfilter/ipvs/ip_vs_proto_sctp.c:1104: error: 'struct netns_ipvs' has no member named 'tcp_app_lock' > > net/netfilter/ipvs/ip_vs_proto_sctp.c:1104: error: 'struct netns_ipvs' has no member named 'tcp_app_lock' > > Thanks, the following patch should resolve this problem. > Hans, could you verify this change? > Ooops, > The change is available at > git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6.git master > > > From: Simon Horman <horms@verge.net.au> > > IPVS: Use correct lock in SCTP module > > Use sctp_app_lock instead of tcp_app_lock in the SCTP protocol module. > > This appears to be a typo introduced by the netns changes. > > Cc: Hans Schillstrom <hans@schillstrom.com> > Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com> > --- > net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c > index fb2d04a..b027ccc 100644 > --- a/net/netfilter/ipvs/ip_vs_proto_sctp.c > +++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c > @@ -1101,7 +1101,7 @@ static void __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd) > struct netns_ipvs *ipvs = net_ipvs(net); > > ip_vs_init_hash_table(ipvs->sctp_apps, SCTP_APP_TAB_SIZE); > - spin_lock_init(&ipvs->tcp_app_lock); > + spin_lock_init(&ipvs->sctp_app_lock); > pd->timeout_table = ip_vs_create_timeout_table((int *)sctp_timeouts, > sizeof(sctp_timeouts)); > } Thanks Hans ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-03 7:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20110201153403.b3a251a3.sfr@canb.auug.org.au>
2011-02-01 17:16 ` linux-next: Tree for February 1 (ip_vs) Randy Dunlap
2011-02-02 22:31 ` Simon Horman
2011-02-03 7:04 ` Hans Schillstrom
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).