From: Julian Anastasov <ja@ssi.bg>
To: Simon Horman <horms@verge.net.au>
Cc: lvs-devel@vger.kernel.org
Subject: Re: [PATCH] ipvs: use pkts for SCTP too
Date: Thu, 2 Sep 2010 10:58:24 +0300 (EEST) [thread overview]
Message-ID: <Pine.LNX.4.58.1009021056210.2773@u.domain.uli> (raw)
In-Reply-To: <20100902020331.GS8174@verge.net.au>
Hello,
On Thu, 2 Sep 2010, Simon Horman wrote:
> On Thu, Sep 02, 2010 at 02:47:26AM +0300, Julian Anastasov wrote:
> >
> > Use correctly the in_pkts packet counter also for SCTP
> >
> > Signed-off-by: Julian Anastasov <ja@ssi.bg>
> > ---
> >
> > This patch is for net-next
>
> Thanks,
>
> apart from the minor nit below, this looks good to me.
> Should I submit it to net-next ?
Yes, please submit the fixed version. Sometimes
I forget that my style for 'else' does not match the kernel's
one.
> > --- v2.6.36-rc2/linux/net/netfilter/ipvs/ip_vs_core.c 2010-09-01 23:47:47.000000000 +0300
> > +++ linux/net/netfilter/ipvs/ip_vs_core.c 2010-09-01 23:55:30.000000000 +0300
> > @@ -1380,8 +1380,7 @@ ip_vs_in(unsigned int hooknum, struct sk
> > if (af == AF_INET && (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
> > cp->protocol == IPPROTO_SCTP) {
> > if ((cp->state == IP_VS_SCTP_S_ESTABLISHED &&
> > - (atomic_read(&cp->in_pkts) %
> > - sysctl_ip_vs_sync_threshold[1]
> > + (pkts % sysctl_ip_vs_sync_threshold[1]
> > == sysctl_ip_vs_sync_threshold[0])) ||
> > (cp->old_state != cp->state &&
> > ((cp->state == IP_VS_SCTP_S_CLOSED) ||
> > @@ -1391,7 +1390,8 @@ ip_vs_in(unsigned int hooknum, struct sk
> > goto out;
> > }
> > }
> > -
> > + else
> > + /* Keep this block last: TCP and others with pp->num_states <= 1 */
> > if (af == AF_INET &&
> > (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
> > (((cp->protocol != IPPROTO_TCP ||
>
> The else and the if really ought to be on the same line:
Yes, thanks!
>
> @@ -1395,7 +1394,8 @@ ip_vs_in(unsigned int hooknum, struct sk
> }
> }
>
> - if (af == AF_INET &&
> + /* Keep this block last: TCP and others with pp->num_states <= 1 */
> + else if (af == AF_INET &&
> (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
> (((cp->protocol != IPPROTO_TCP ||
> cp->state == IP_VS_TCP_S_ESTABLISHED) &&
>
Regards
--
Julian Anastasov <ja@ssi.bg>
next prev parent reply other threads:[~2010-09-02 7:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-01 23:47 [PATCH] ipvs: use pkts for SCTP too Julian Anastasov
2010-09-02 2:03 ` Simon Horman
2010-09-02 7:58 ` Julian Anastasov [this message]
2010-09-02 8:13 ` Simon Horman
2010-09-02 8:19 ` [patch net-next] " Simon Horman
2010-09-02 17:05 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.58.1009021056210.2773@u.domain.uli \
--to=ja@ssi.bg \
--cc=horms@verge.net.au \
--cc=lvs-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.