On Tue, Oct 26, 2010 at 01:00:20PM +0200, Hans Schillstrom wrote:
> Two structs will have fwmark added:
> * ip_vs_conn
> * ip_vs_conn_param
>
> ip_vs_conn_fill_param will have an extra param - fwmark
> The effects of that is in this patch.
This looks good to me, with the exception of
the minor formatting nit below.
I have fixed it as I describe below and queued it up for nf-next-2.6
once it opens.
> Signed-off-by: Hans Schillstrom <hans.schillstrom@xxxxxxxxxxxx>
[ snip ]
> diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
> index b4e51e9..61abf39 100644
> --- a/net/netfilter/ipvs/ip_vs_core.c
> +++ b/net/netfilter/ipvs/ip_vs_core.c
[ snip ]
> @@ -485,8 +486,8 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
> {
> struct ip_vs_conn_param p;
> ip_vs_conn_fill_param(svc->af, iph.protocol,
> - &iph.saddr, pptr[0],
> - &iph.daddr, pptr[1], &p);
> + &iph.saddr, pptr[0],&iph.daddr,
> + pptr[1], skb->mark, &p);
Could you please put a space after the ,?
For the record, the following is my preferred formatting.
ip_vs_conn_fill_param(svc->af, iph.protocol,
&iph.saddr, pptr[0],
&iph.daddr, pptr[1],
skb->mark, &p);
> cp = ip_vs_conn_new(&p, &daddr, 0,
> IP_VS_CONN_F_BYPASS | flags,
> NULL);
[ snip ]
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
