* [GIT PULL nf-next] IPVS
@ 2011-10-21 1:33 Simon Horman
2011-10-21 1:33 ` [PATCH 1/2] ipvs: Remove unused variable "cs" from ip_vs_leave function Simon Horman
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Simon Horman @ 2011-10-21 1:33 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski
Hi Pablo,
please consider pulling the following to get compile fix
and cleanup patches from Krzysztof Wilczynski.
The following changes since commit 2ca5b853f1dd81c605ddc8a55e06bdad85636597:
netfilter: export NAT definitions through linux/netfilter_ipv4/nf_nat.h (2011-10-11 03:32:34 +0200)
are available in the git repository at:
git://github.com/horms/ipvs-next.git master
Krzysztof Wilczynski (2):
ipvs: Remove unused variable "cs" from ip_vs_leave function.
ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function.
include/net/ip_vs.h | 2 +-
net/netfilter/ipvs/ip_vs_core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] ipvs: Remove unused variable "cs" from ip_vs_leave function.
2011-10-21 1:33 [GIT PULL nf-next] IPVS Simon Horman
@ 2011-10-21 1:33 ` Simon Horman
2011-10-21 1:33 ` [PATCH 2/2] ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function Simon Horman
2011-10-21 7:27 ` [GIT PULL nf-next] IPVS Pablo Neira Ayuso
2 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2011-10-21 1:33 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski, Simon Horman
From: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
This is to address the following warning during compilation time:
net/netfilter/ipvs/ip_vs_core.c: In function ‘ip_vs_leave’:
net/netfilter/ipvs/ip_vs_core.c:532: warning: unused variable ‘cs’
This variable is indeed no longer in use.
Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 46a8130..093cc32 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -529,7 +529,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
a cache_bypass connection entry */
ipvs = net_ipvs(net);
if (ipvs->sysctl_cache_bypass && svc->fwmark && unicast) {
- int ret, cs;
+ int ret;
struct ip_vs_conn *cp;
unsigned int flags = (svc->flags & IP_VS_SVC_F_ONEPACKET &&
iph.protocol == IPPROTO_UDP)?
--
1.7.6.3
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function.
2011-10-21 1:33 [GIT PULL nf-next] IPVS Simon Horman
2011-10-21 1:33 ` [PATCH 1/2] ipvs: Remove unused variable "cs" from ip_vs_leave function Simon Horman
@ 2011-10-21 1:33 ` Simon Horman
2011-10-21 7:27 ` [GIT PULL nf-next] IPVS Pablo Neira Ayuso
2 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2011-10-21 1:33 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski, Simon Horman
From: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
This is to address the following error during the compilation:
In file included from kernel/sysctl_binary.c:6:
include/net/ip_vs.h:1406: error: expected identifier or ‘(’ before ‘{’ token
make[1]: *** [kernel/sysctl_binary.o] Error 1
make[1]: *** Waiting for unfinished jobs....
That manifests itself when CONFIG_IP_VS_NFCT is undefined in .config file.
Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
include/net/ip_vs.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 139784e..de527d1 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1395,7 +1395,7 @@ static inline void ip_vs_update_conntrack(struct sk_buff *skb,
{
}
-static inline int ip_vs_confirm_conntrack(struct sk_buff *skb);
+static inline int ip_vs_confirm_conntrack(struct sk_buff *skb)
{
return NF_ACCEPT;
}
--
1.7.6.3
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [GIT PULL nf-next] IPVS
2011-10-21 1:33 [GIT PULL nf-next] IPVS Simon Horman
2011-10-21 1:33 ` [PATCH 1/2] ipvs: Remove unused variable "cs" from ip_vs_leave function Simon Horman
2011-10-21 1:33 ` [PATCH 2/2] ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function Simon Horman
@ 2011-10-21 7:27 ` Pablo Neira Ayuso
2011-11-07 3:07 ` Simon Horman
2 siblings, 1 reply; 9+ messages in thread
From: Pablo Neira Ayuso @ 2011-10-21 7:27 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski
On Fri, Oct 21, 2011 at 10:33:01AM +0900, Simon Horman wrote:
> Hi Pablo,
>
> please consider pulling the following to get compile fix
> and cleanup patches from Krzysztof Wilczynski.
>
> The following changes since commit 2ca5b853f1dd81c605ddc8a55e06bdad85636597:
>
> netfilter: export NAT definitions through linux/netfilter_ipv4/nf_nat.h (2011-10-11 03:32:34 +0200)
>
> are available in the git repository at:
> git://github.com/horms/ipvs-next.git master
Pulled, thanks.
http://1984.lsi.us.es/git/?p=net-next/.git;a=shortlog;h=refs/heads/nf-next
> Krzysztof Wilczynski (2):
> ipvs: Remove unused variable "cs" from ip_vs_leave function.
> ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function.
Strange, I have all IPVS configs enabled here and I didn't hit this error.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL nf-next] IPVS
2011-10-21 7:27 ` [GIT PULL nf-next] IPVS Pablo Neira Ayuso
@ 2011-11-07 3:07 ` Simon Horman
2011-11-07 8:29 ` Pablo Neira Ayuso
0 siblings, 1 reply; 9+ messages in thread
From: Simon Horman @ 2011-11-07 3:07 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski
On Fri, Oct 21, 2011 at 09:27:15AM +0200, Pablo Neira Ayuso wrote:
> On Fri, Oct 21, 2011 at 10:33:01AM +0900, Simon Horman wrote:
> > Hi Pablo,
> >
> > please consider pulling the following to get compile fix
> > and cleanup patches from Krzysztof Wilczynski.
> >
> > The following changes since commit 2ca5b853f1dd81c605ddc8a55e06bdad85636597:
> >
> > netfilter: export NAT definitions through linux/netfilter_ipv4/nf_nat.h (2011-10-11 03:32:34 +0200)
> >
> > are available in the git repository at:
> > git://github.com/horms/ipvs-next.git master
>
> Pulled, thanks.
>
> http://1984.lsi.us.es/git/?p=net-next/.git;a=shortlog;h=refs/heads/nf-next
>
> > Krzysztof Wilczynski (2):
> > ipvs: Remove unused variable "cs" from ip_vs_leave function.
> > ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function.
>
> Strange, I have all IPVS configs enabled here and I didn't hit this error.
Hi Pablo,
I am a little confused. The nf-next branch seems to have disappeared.
Could you consider pulling git://github.com/horms/ipvs-next.git master
to get the following changes that were in your nf-next branch. Or would
you like me to rebase the ipvs patches (9 or the 11 changes below) on
top of git://1984.lsi.us.es/net-next/.git master ?
------
The following changes since commit a9e9fd7182332d0cf5f3e601df3e71dd431b70d7:
skge: handle irq better on single port card (2011-09-27 13:41:37 -0400)
are available in the git repository at:
git://github.com/horms/ipvs-next.git master
Joe Perches (1):
netfilter: Remove unnecessary OOM logging messages
Krzysztof Wilczynski (3):
ipvs: Expose ip_vs_ftp module parameters via sysfs.
ipvs: Remove unused variable "cs" from ip_vs_leave function.
ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function.
Pablo Neira Ayuso (1):
netfilter: export NAT definitions through linux/netfilter_ipv4/nf_nat.h
Simon Horman (6):
ipvs: Add documentation for new sysctl entries
ipvs: Remove unused parameter from ip_vs_confirm_conntrack()
ipvs: Remove unused return value of protocol state transitions
ipvs: Removed unused variables
ipvs: secure_tcp does provide alternate state timeouts
ipvs: Enhance grammar used to refer to Kconfig options
Documentation/networking/ipvs-sysctl.txt | 62 ++++++++++++++++++++++++---
include/linux/netfilter_ipv4/Kbuild | 1 +
include/linux/netfilter_ipv4/nf_nat.h | 58 ++++++++++++++++++++++++++
include/net/ip_vs.h | 11 ++---
include/net/netfilter/nf_conntrack_tuple.h | 27 +------------
include/net/netfilter/nf_nat.h | 26 +-----------
net/bridge/netfilter/ebt_ulog.c | 7 +--
net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 -
net/ipv4/netfilter/ipt_ULOG.c | 4 +-
net/ipv4/netfilter/nf_nat_snmp_basic.c | 22 +---------
net/ipv6/netfilter/nf_conntrack_reasm.c | 7 +--
net/netfilter/ipset/ip_set_core.c | 4 +-
net/netfilter/ipvs/ip_vs_core.c | 20 ++++-----
net/netfilter/ipvs/ip_vs_ctl.c | 22 +++-------
net/netfilter/ipvs/ip_vs_dh.c | 5 +-
net/netfilter/ipvs/ip_vs_ftp.c | 5 +-
net/netfilter/ipvs/ip_vs_lblc.c | 9 +---
net/netfilter/ipvs/ip_vs_lblcr.c | 13 ++----
net/netfilter/ipvs/ip_vs_nfct.c | 2 +-
net/netfilter/ipvs/ip_vs_proto.c | 5 +-
net/netfilter/ipvs/ip_vs_proto_sctp.c | 14 ++----
net/netfilter/ipvs/ip_vs_proto_tcp.c | 6 +--
net/netfilter/ipvs/ip_vs_proto_udp.c | 5 +-
net/netfilter/ipvs/ip_vs_sh.c | 5 +-
net/netfilter/ipvs/ip_vs_wrr.c | 5 +-
net/netfilter/ipvs/ip_vs_xmit.c | 2 +-
net/netfilter/nf_conntrack_core.c | 5 +--
net/netfilter/nfnetlink_log.c | 7 +--
net/netfilter/xt_IDLETIMER.c | 2 -
net/netfilter/xt_hashlimit.c | 5 +--
30 files changed, 178 insertions(+), 189 deletions(-)
create mode 100644 include/linux/netfilter_ipv4/nf_nat.h
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL nf-next] IPVS
2011-11-07 3:07 ` Simon Horman
@ 2011-11-07 8:29 ` Pablo Neira Ayuso
2011-11-09 0:58 ` Simon Horman
0 siblings, 1 reply; 9+ messages in thread
From: Pablo Neira Ayuso @ 2011-11-07 8:29 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski
Hi Simon,
On Mon, Nov 07, 2011 at 12:07:01PM +0900, Simon Horman wrote:
> Hi Pablo,
>
> I am a little confused. The nf-next branch seems to have disappeared.
>
> Could you consider pulling git://github.com/horms/ipvs-next.git master
> to get the following changes that were in your nf-next branch.
I was late to get it into net-next. Since net-next became net after
the 3.1 release, my moved those changes to net to get it into 3.2
once Linus announced that the merge window was opened again.
> Or would
> you like me to rebase the ipvs patches (9 or the 11 changes below) on
> top of git://1984.lsi.us.es/net-next/.git master ?
They are already in net davem's tree, they will be included in the
upcoming 3.2 release.
http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet.git&a=search&h=HEAD&st=commit&s=Neira
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL nf-next] IPVS
2011-11-07 8:29 ` Pablo Neira Ayuso
@ 2011-11-09 0:58 ` Simon Horman
2011-11-09 14:36 ` Pablo Neira Ayuso
0 siblings, 1 reply; 9+ messages in thread
From: Simon Horman @ 2011-11-09 0:58 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski
Hi Pablo,
On Mon, Nov 07, 2011 at 09:29:56AM +0100, Pablo Neira Ayuso wrote:
> Hi Simon,
>
> On Mon, Nov 07, 2011 at 12:07:01PM +0900, Simon Horman wrote:
> > Hi Pablo,
> >
> > I am a little confused. The nf-next branch seems to have disappeared.
> >
> > Could you consider pulling git://github.com/horms/ipvs-next.git master
> > to get the following changes that were in your nf-next branch.
>
> I was late to get it into net-next. Since net-next became net after
> the 3.1 release, my moved those changes to net to get it into 3.2
> once Linus announced that the merge window was opened again.
>
> > Or would
> > you like me to rebase the ipvs patches (9 or the 11 changes below) on
> > top of git://1984.lsi.us.es/net-next/.git master ?
>
> They are already in net davem's tree, they will be included in the
> upcoming 3.2 release.
>
> http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet.git&a=search&h=HEAD&st=commit&s=Neira
Thanks, and sorry for missing that when I checked yesterday.
Could you suggest which tree and branch I should base the master branch of my
ipvs and ipvs-next trees on? Their purposes are to provide a reference for
people wishing to fix or enhance IPVS and a mechanism to send pull requests to
you. As of now I am using the master branch of your net tree for both.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL nf-next] IPVS
2011-11-09 0:58 ` Simon Horman
@ 2011-11-09 14:36 ` Pablo Neira Ayuso
2011-11-10 1:22 ` Simon Horman
0 siblings, 1 reply; 9+ messages in thread
From: Pablo Neira Ayuso @ 2011-11-09 14:36 UTC (permalink / raw)
To: Simon Horman
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski
On Wed, Nov 09, 2011 at 09:58:07AM +0900, Simon Horman wrote:
> Hi Pablo,
>
> On Mon, Nov 07, 2011 at 09:29:56AM +0100, Pablo Neira Ayuso wrote:
> > Hi Simon,
> >
> > On Mon, Nov 07, 2011 at 12:07:01PM +0900, Simon Horman wrote:
> > > Hi Pablo,
> > >
> > > I am a little confused. The nf-next branch seems to have disappeared.
> > >
> > > Could you consider pulling git://github.com/horms/ipvs-next.git master
> > > to get the following changes that were in your nf-next branch.
> >
> > I was late to get it into net-next. Since net-next became net after
> > the 3.1 release, my moved those changes to net to get it into 3.2
> > once Linus announced that the merge window was opened again.
> >
> > > Or would
> > > you like me to rebase the ipvs patches (9 or the 11 changes below) on
> > > top of git://1984.lsi.us.es/net-next/.git master ?
> >
> > They are already in net davem's tree, they will be included in the
> > upcoming 3.2 release.
> >
> > http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet.git&a=search&h=HEAD&st=commit&s=Neira
>
> Thanks, and sorry for missing that when I checked yesterday.
>
> Could you suggest which tree and branch I should base the master branch of my
> ipvs and ipvs-next trees on? Their purposes are to provide a reference for
> people wishing to fix or enhance IPVS and a mechanism to send pull requests to
> you. As of now I am using the master branch of your net tree for both.
The 1984.lsi.us.es trees are fine.
There are no branch yet because I have no patches queued for upstream
so far. You can use master if you don't see any nf branch, OK?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [GIT PULL nf-next] IPVS
2011-11-09 14:36 ` Pablo Neira Ayuso
@ 2011-11-10 1:22 ` Simon Horman
0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2011-11-10 1:22 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: lvs-devel, netdev, netfilter-devel, Wensong Zhang,
Julian Anastasov, Krzysztof Wilczynski
On Wed, Nov 09, 2011 at 03:36:41PM +0100, Pablo Neira Ayuso wrote:
> On Wed, Nov 09, 2011 at 09:58:07AM +0900, Simon Horman wrote:
> > Hi Pablo,
> >
> > On Mon, Nov 07, 2011 at 09:29:56AM +0100, Pablo Neira Ayuso wrote:
> > > Hi Simon,
> > >
> > > On Mon, Nov 07, 2011 at 12:07:01PM +0900, Simon Horman wrote:
> > > > Hi Pablo,
> > > >
> > > > I am a little confused. The nf-next branch seems to have disappeared.
> > > >
> > > > Could you consider pulling git://github.com/horms/ipvs-next.git master
> > > > to get the following changes that were in your nf-next branch.
> > >
> > > I was late to get it into net-next. Since net-next became net after
> > > the 3.1 release, my moved those changes to net to get it into 3.2
> > > once Linus announced that the merge window was opened again.
> > >
> > > > Or would
> > > > you like me to rebase the ipvs patches (9 or the 11 changes below) on
> > > > top of git://1984.lsi.us.es/net-next/.git master ?
> > >
> > > They are already in net davem's tree, they will be included in the
> > > upcoming 3.2 release.
> > >
> > > http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet.git&a=search&h=HEAD&st=commit&s=Neira
> >
> > Thanks, and sorry for missing that when I checked yesterday.
> >
> > Could you suggest which tree and branch I should base the master branch of my
> > ipvs and ipvs-next trees on? Their purposes are to provide a reference for
> > people wishing to fix or enhance IPVS and a mechanism to send pull requests to
> > you. As of now I am using the master branch of your net tree for both.
>
> The 1984.lsi.us.es trees are fine.
>
> There are no branch yet because I have no patches queued for upstream
> so far. You can use master if you don't see any nf branch, OK?
Ok :)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-11-10 1:22 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-21 1:33 [GIT PULL nf-next] IPVS Simon Horman
2011-10-21 1:33 ` [PATCH 1/2] ipvs: Remove unused variable "cs" from ip_vs_leave function Simon Horman
2011-10-21 1:33 ` [PATCH 2/2] ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function Simon Horman
2011-10-21 7:27 ` [GIT PULL nf-next] IPVS Pablo Neira Ayuso
2011-11-07 3:07 ` Simon Horman
2011-11-07 8:29 ` Pablo Neira Ayuso
2011-11-09 0:58 ` Simon Horman
2011-11-09 14:36 ` Pablo Neira Ayuso
2011-11-10 1:22 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.