* [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp
@ 2017-10-26 8:52 gfree.wind
2017-10-28 10:39 ` Julian Anastasov
0 siblings, 1 reply; 8+ messages in thread
From: gfree.wind @ 2017-10-26 8:52 UTC (permalink / raw)
To: wensong, horms, ja; +Cc: lvs-devel, Gao Feng
From: Gao Feng <gfree.wind@vip.163.com>
The param of frag_safe_skb_hp, ipvsh, isn't used now. So remove it and
change the callers' codes.
Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
---
include/net/ip_vs.h | 3 +--
net/netfilter/ipvs/ip_vs_conn.c | 2 +-
net/netfilter/ipvs/ip_vs_core.c | 12 ++++++------
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 4f4f786..6fccd24 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -68,8 +68,7 @@ struct ip_vs_iphdr {
};
static inline void *frag_safe_skb_hp(const struct sk_buff *skb, int offset,
- int len, void *buffer,
- const struct ip_vs_iphdr *ipvsh)
+ int len, void *buffer)
{
return skb_header_pointer(skb, offset, len, buffer);
}
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 3d2ac71a..9ee73cf 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -322,7 +322,7 @@ struct ip_vs_conn *ip_vs_conn_in_get(const struct ip_vs_conn_param *p)
{
__be16 _ports[2], *pptr;
- pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);
+ pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports);
if (pptr == NULL)
return 1;
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 5cb7cac..5f6f73c 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -433,7 +433,7 @@ struct ip_vs_conn *
/*
* IPv6 frags, only the first hit here.
*/
- pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);
+ pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports);
if (pptr == NULL)
return NULL;
@@ -566,7 +566,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
struct netns_ipvs *ipvs = svc->ipvs;
struct net *net = ipvs->net;
- pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);
+ pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports);
if (!pptr)
return NF_DROP;
dport = likely(!ip_vs_iph_inverse(iph)) ? pptr[1] : pptr[0];
@@ -982,7 +982,7 @@ static int ip_vs_out_icmp_v6(struct netns_ipvs *ipvs, struct sk_buff *skb,
unsigned int offset;
*related = 1;
- ic = frag_safe_skb_hp(skb, ipvsh->len, sizeof(_icmph), &_icmph, ipvsh);
+ ic = frag_safe_skb_hp(skb, ipvsh->len, sizeof(_icmph), &_icmph);
if (ic == NULL)
return NF_DROP;
@@ -1214,7 +1214,7 @@ static struct ip_vs_conn *__ip_vs_rs_conn_out(unsigned int hooknum,
return NULL;
pptr = frag_safe_skb_hp(skb, iph->len,
- sizeof(_ports), _ports, iph);
+ sizeof(_ports), _ports);
if (!pptr)
return NULL;
@@ -1407,7 +1407,7 @@ static struct ip_vs_conn *__ip_vs_rs_conn_out(unsigned int hooknum,
__be16 _ports[2], *pptr;
pptr = frag_safe_skb_hp(skb, iph.len,
- sizeof(_ports), _ports, &iph);
+ sizeof(_ports), _ports);
if (pptr == NULL)
return NF_ACCEPT; /* Not for me */
if (ip_vs_has_real_service(ipvs, af, iph.protocol, &iph.saddr,
@@ -1741,7 +1741,7 @@ static int ip_vs_in_icmp_v6(struct netns_ipvs *ipvs, struct sk_buff *skb,
*related = 1;
- ic = frag_safe_skb_hp(skb, iph->len, sizeof(_icmph), &_icmph, iph);
+ ic = frag_safe_skb_hp(skb, iph->len, sizeof(_icmph), &_icmph);
if (ic == NULL)
return NF_DROP;
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp
2017-10-26 8:52 [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp gfree.wind
@ 2017-10-28 10:39 ` Julian Anastasov
2017-11-02 14:47 ` Simon Horman
0 siblings, 1 reply; 8+ messages in thread
From: Julian Anastasov @ 2017-10-28 10:39 UTC (permalink / raw)
To: Gao Feng; +Cc: Wensong Zhang, Simon Horman, lvs-devel
Hello,
On Thu, 26 Oct 2017, gfree.wind@vip.163.com wrote:
> From: Gao Feng <gfree.wind@vip.163.com>
>
> The param of frag_safe_skb_hp, ipvsh, isn't used now. So remove it and
> change the callers' codes.
>
> Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
Looks good to me. Simon, please apply to ipvs-next tree.
Acked-by: Julian Anastasov <ja@ssi.bg>
> ---
> include/net/ip_vs.h | 3 +--
> net/netfilter/ipvs/ip_vs_conn.c | 2 +-
> net/netfilter/ipvs/ip_vs_core.c | 12 ++++++------
> 3 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
> index 4f4f786..6fccd24 100644
> --- a/include/net/ip_vs.h
> +++ b/include/net/ip_vs.h
> @@ -68,8 +68,7 @@ struct ip_vs_iphdr {
> };
>
> static inline void *frag_safe_skb_hp(const struct sk_buff *skb, int offset,
> - int len, void *buffer,
> - const struct ip_vs_iphdr *ipvsh)
> + int len, void *buffer)
> {
> return skb_header_pointer(skb, offset, len, buffer);
> }
> diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
> index 3d2ac71a..9ee73cf 100644
> --- a/net/netfilter/ipvs/ip_vs_conn.c
> +++ b/net/netfilter/ipvs/ip_vs_conn.c
> @@ -322,7 +322,7 @@ struct ip_vs_conn *ip_vs_conn_in_get(const struct ip_vs_conn_param *p)
> {
> __be16 _ports[2], *pptr;
>
> - pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);
> + pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports);
> if (pptr == NULL)
> return 1;
>
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index 5cb7cac..5f6f73c 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
> @@ -433,7 +433,7 @@ struct ip_vs_conn *
> /*
> * IPv6 frags, only the first hit here.
> */
> - pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);
> + pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports);
> if (pptr == NULL)
> return NULL;
>
> @@ -566,7 +566,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
> struct netns_ipvs *ipvs = svc->ipvs;
> struct net *net = ipvs->net;
>
> - pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports, iph);
> + pptr = frag_safe_skb_hp(skb, iph->len, sizeof(_ports), _ports);
> if (!pptr)
> return NF_DROP;
> dport = likely(!ip_vs_iph_inverse(iph)) ? pptr[1] : pptr[0];
> @@ -982,7 +982,7 @@ static int ip_vs_out_icmp_v6(struct netns_ipvs *ipvs, struct sk_buff *skb,
> unsigned int offset;
>
> *related = 1;
> - ic = frag_safe_skb_hp(skb, ipvsh->len, sizeof(_icmph), &_icmph, ipvsh);
> + ic = frag_safe_skb_hp(skb, ipvsh->len, sizeof(_icmph), &_icmph);
> if (ic == NULL)
> return NF_DROP;
>
> @@ -1214,7 +1214,7 @@ static struct ip_vs_conn *__ip_vs_rs_conn_out(unsigned int hooknum,
> return NULL;
>
> pptr = frag_safe_skb_hp(skb, iph->len,
> - sizeof(_ports), _ports, iph);
> + sizeof(_ports), _ports);
> if (!pptr)
> return NULL;
>
> @@ -1407,7 +1407,7 @@ static struct ip_vs_conn *__ip_vs_rs_conn_out(unsigned int hooknum,
> __be16 _ports[2], *pptr;
>
> pptr = frag_safe_skb_hp(skb, iph.len,
> - sizeof(_ports), _ports, &iph);
> + sizeof(_ports), _ports);
> if (pptr == NULL)
> return NF_ACCEPT; /* Not for me */
> if (ip_vs_has_real_service(ipvs, af, iph.protocol, &iph.saddr,
> @@ -1741,7 +1741,7 @@ static int ip_vs_in_icmp_v6(struct netns_ipvs *ipvs, struct sk_buff *skb,
>
> *related = 1;
>
> - ic = frag_safe_skb_hp(skb, iph->len, sizeof(_icmph), &_icmph, iph);
> + ic = frag_safe_skb_hp(skb, iph->len, sizeof(_icmph), &_icmph);
> if (ic == NULL)
> return NF_DROP;
>
> --
> 1.9.1
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp
2017-10-28 10:39 ` Julian Anastasov
@ 2017-11-02 14:47 ` Simon Horman
2017-11-13 8:00 ` Simon Horman
2017-11-13 8:48 ` Gao Feng
0 siblings, 2 replies; 8+ messages in thread
From: Simon Horman @ 2017-11-02 14:47 UTC (permalink / raw)
To: Julian Anastasov; +Cc: Gao Feng, Wensong Zhang, lvs-devel
On Sat, Oct 28, 2017 at 01:39:43PM +0300, Julian Anastasov wrote:
>
> Hello,
>
> On Thu, 26 Oct 2017, gfree.wind@vip.163.com wrote:
>
> > From: Gao Feng <gfree.wind@vip.163.com>
> >
> > The param of frag_safe_skb_hp, ipvsh, isn't used now. So remove it and
> > change the callers' codes.
> >
> > Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
>
> Looks good to me. Simon, please apply to ipvs-next tree.
>
> Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Pablo, can you take this one?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp
2017-11-02 14:47 ` Simon Horman
@ 2017-11-13 8:00 ` Simon Horman
2017-11-13 8:33 ` Simon Horman
2017-11-13 8:48 ` Gao Feng
1 sibling, 1 reply; 8+ messages in thread
From: Simon Horman @ 2017-11-13 8:00 UTC (permalink / raw)
To: Julian Anastasov; +Cc: Gao Feng, Wensong Zhang, lvs-devel
On Thu, Nov 02, 2017 at 03:47:43PM +0100, Simon Horman wrote:
> On Sat, Oct 28, 2017 at 01:39:43PM +0300, Julian Anastasov wrote:
> >
> > Hello,
> >
> > On Thu, 26 Oct 2017, gfree.wind@vip.163.com wrote:
> >
> > > From: Gao Feng <gfree.wind@vip.163.com>
> > >
> > > The param of frag_safe_skb_hp, ipvsh, isn't used now. So remove it and
> > > change the callers' codes.
> > >
> > > Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
> >
> > Looks good to me. Simon, please apply to ipvs-next tree.
> >
> > Acked-by: Julian Anastasov <ja@ssi.bg>
>
> Signed-off-by: Simon Horman <horms@verge.net.au>
>
> Pablo, can you take this one?
I think I would rather it go via Pablo's tree and in turn net-next
as that is the normal route for IPVS patches.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp
2017-11-13 8:00 ` Simon Horman
@ 2017-11-13 8:33 ` Simon Horman
2017-11-13 9:09 ` Julian Anastasov
0 siblings, 1 reply; 8+ messages in thread
From: Simon Horman @ 2017-11-13 8:33 UTC (permalink / raw)
To: Julian Anastasov; +Cc: Gao Feng, Wensong Zhang, lvs-devel
On Mon, Nov 13, 2017 at 09:00:59AM +0100, Simon Horman wrote:
> On Thu, Nov 02, 2017 at 03:47:43PM +0100, Simon Horman wrote:
> > On Sat, Oct 28, 2017 at 01:39:43PM +0300, Julian Anastasov wrote:
> > >
> > > Hello,
> > >
> > > On Thu, 26 Oct 2017, gfree.wind@vip.163.com wrote:
> > >
> > > > From: Gao Feng <gfree.wind@vip.163.com>
> > > >
> > > > The param of frag_safe_skb_hp, ipvsh, isn't used now. So remove it and
> > > > change the callers' codes.
> > > >
> > > > Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
> > >
> > > Looks good to me. Simon, please apply to ipvs-next tree.
> > >
> > > Acked-by: Julian Anastasov <ja@ssi.bg>
> >
> > Signed-off-by: Simon Horman <horms@verge.net.au>
> >
> > Pablo, can you take this one?
>
> I think I would rather it go via Pablo's tree and in turn net-next
> as that is the normal route for IPVS patches.
I seem to have responded to the wrong email here.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re:Re: [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp
2017-11-02 14:47 ` Simon Horman
2017-11-13 8:00 ` Simon Horman
@ 2017-11-13 8:48 ` Gao Feng
1 sibling, 0 replies; 8+ messages in thread
From: Gao Feng @ 2017-11-13 8:48 UTC (permalink / raw)
To: Simon Horman; +Cc: Julian Anastasov, Wensong Zhang, lvs-devel
At 2017-11-02 22:47:43, "Simon Horman" <horms@verge.net.au> wrote:
>On Sat, Oct 28, 2017 at 01:39:43PM +0300, Julian Anastasov wrote:
>>
>> Hello,
>>
>> On Thu, 26 Oct 2017, gfree.wind@vip.163.com wrote:
>>
>> > From: Gao Feng <gfree.wind@vip.163.com>
>> >
>> > The param of frag_safe_skb_hp, ipvsh, isn't used now. So remove it and
>> > change the callers' codes.
>> >
>> > Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
>>
>> Looks good to me. Simon, please apply to ipvs-next tree.
>>
>> Acked-by: Julian Anastasov <ja@ssi.bg>
>
>Signed-off-by: Simon Horman <horms@verge.net.au>
>
>Pablo, can you take this one?
>
Hi Pablo & Simon,
Need I resend a new patch to nf-next ?
Best Regards
Feng
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp
2017-11-13 8:33 ` Simon Horman
@ 2017-11-13 9:09 ` Julian Anastasov
2017-11-22 18:12 ` Simon Horman
0 siblings, 1 reply; 8+ messages in thread
From: Julian Anastasov @ 2017-11-13 9:09 UTC (permalink / raw)
To: Simon Horman; +Cc: Gao Feng, Wensong Zhang, lvs-devel
Hello,
On Mon, 13 Nov 2017, Simon Horman wrote:
> On Mon, Nov 13, 2017 at 09:00:59AM +0100, Simon Horman wrote:
> > On Thu, Nov 02, 2017 at 03:47:43PM +0100, Simon Horman wrote:
> > > On Sat, Oct 28, 2017 at 01:39:43PM +0300, Julian Anastasov wrote:
> > > >
> > > > Hello,
> > > >
> > > > On Thu, 26 Oct 2017, gfree.wind@vip.163.com wrote:
> > > >
> > > > > From: Gao Feng <gfree.wind@vip.163.com>
> > > > >
> > > > > The param of frag_safe_skb_hp, ipvsh, isn't used now. So remove it and
> > > > > change the callers' codes.
> > > > >
> > > > > Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
> > > >
> > > > Looks good to me. Simon, please apply to ipvs-next tree.
> > > >
> > > > Acked-by: Julian Anastasov <ja@ssi.bg>
> > >
> > > Signed-off-by: Simon Horman <horms@verge.net.au>
> > >
> > > Pablo, can you take this one?
> >
> > I think I would rather it go via Pablo's tree and in turn net-next
> > as that is the normal route for IPVS patches.
>
> I seem to have responded to the wrong email here.
Recently we see only few small patches for -next, so
you can write to Pablo to take them directly.
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp
2017-11-13 9:09 ` Julian Anastasov
@ 2017-11-22 18:12 ` Simon Horman
0 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2017-11-22 18:12 UTC (permalink / raw)
To: Julian Anastasov; +Cc: Gao Feng, Wensong Zhang, lvs-devel
On Mon, Nov 13, 2017 at 11:09:03AM +0200, Julian Anastasov wrote:
>
> Hello,
>
> On Mon, 13 Nov 2017, Simon Horman wrote:
>
> > On Mon, Nov 13, 2017 at 09:00:59AM +0100, Simon Horman wrote:
> > > On Thu, Nov 02, 2017 at 03:47:43PM +0100, Simon Horman wrote:
> > > > On Sat, Oct 28, 2017 at 01:39:43PM +0300, Julian Anastasov wrote:
> > > > >
> > > > > Hello,
> > > > >
> > > > > On Thu, 26 Oct 2017, gfree.wind@vip.163.com wrote:
> > > > >
> > > > > > From: Gao Feng <gfree.wind@vip.163.com>
> > > > > >
> > > > > > The param of frag_safe_skb_hp, ipvsh, isn't used now. So remove it and
> > > > > > change the callers' codes.
> > > > > >
> > > > > > Signed-off-by: Gao Feng <gfree.wind@vip.163.com>
> > > > >
> > > > > Looks good to me. Simon, please apply to ipvs-next tree.
> > > > >
> > > > > Acked-by: Julian Anastasov <ja@ssi.bg>
> > > >
> > > > Signed-off-by: Simon Horman <horms@verge.net.au>
> > > >
> > > > Pablo, can you take this one?
> > >
> > > I think I would rather it go via Pablo's tree and in turn net-next
> > > as that is the normal route for IPVS patches.
> >
> > I seem to have responded to the wrong email here.
>
> Recently we see only few small patches for -next, so
> you can write to Pablo to take them directly.
Yes, agreed.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-11-22 18:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-26 8:52 [PATCH nf-next 1/1] ipvs: Remove useless ipvsh param of frag_safe_skb_hp gfree.wind
2017-10-28 10:39 ` Julian Anastasov
2017-11-02 14:47 ` Simon Horman
2017-11-13 8:00 ` Simon Horman
2017-11-13 8:33 ` Simon Horman
2017-11-13 9:09 ` Julian Anastasov
2017-11-22 18:12 ` Simon Horman
2017-11-13 8:48 ` Gao Feng
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.