Message ID | 1586217541-31371-1-git-send-email-u9012063@gmail.com |
---|---|
State | Accepted |
Commit | 146f52b9ef8a5f61f39bfd5644638c7608ccceca |
Headers | show |
Series | [ovs-dev,PATCHv2] ovs-vswitchd: Fix icmp reply timeout description. | expand |
On 4/6/2020 4:59 PM, William Tu wrote: > Currently the userspace datapath implements conntrack ICMP reply state > as when ICMP packets have been seen on both directions. However, the > description is defined as timeout of the connection after an ICMP error > is replied in response to an ICMP packet. > > Fixes: 61a5264d60d0c ("ovs-vswitchd: Add Datapath, CT_Zone, and CT_Zone_Policy tables.") > Signed-off-by: William Tu <u9012063@gmail.com> > --- > vswitchd/vswitch.xml | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml > index f9339af85edd..6d334370d252 100644 > --- a/vswitchd/vswitch.xml > +++ b/vswitchd/vswitch.xml > @@ -6137,9 +6137,9 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ > </column> > > <column name="timeouts" key="icmp_reply"> > - The timeout of the connection after an ICMP error is replied in > - response to an ICMP packet. This timeout is only supported by > - the userspace datapath. > + The timeout of the connection when ICMP packets have been seen in > + both direction. This timeout is only supported by the userspace > + datapath. > </column> > </group> > </group> > Hmm... well I already acked the first version of this patch. I didn't see this one. In any case this looks fine too. Acked-by: Greg Rose <gvrose8192@gmail.com>
On Tue, Apr 07, 2020 at 10:47:50AM -0700, Gregory Rose wrote: > > > On 4/6/2020 4:59 PM, William Tu wrote: > >Currently the userspace datapath implements conntrack ICMP reply state > >as when ICMP packets have been seen on both directions. However, the > >description is defined as timeout of the connection after an ICMP error > >is replied in response to an ICMP packet. > > > >Fixes: 61a5264d60d0c ("ovs-vswitchd: Add Datapath, CT_Zone, and CT_Zone_Policy tables.") > >Signed-off-by: William Tu <u9012063@gmail.com> > >--- > > vswitchd/vswitch.xml | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > >diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml > >index f9339af85edd..6d334370d252 100644 > >--- a/vswitchd/vswitch.xml > >+++ b/vswitchd/vswitch.xml > >@@ -6137,9 +6137,9 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ > > </column> > > <column name="timeouts" key="icmp_reply"> > >- The timeout of the connection after an ICMP error is replied in > >- response to an ICMP packet. This timeout is only supported by > >- the userspace datapath. > >+ The timeout of the connection when ICMP packets have been seen in > >+ both direction. This timeout is only supported by the userspace > >+ datapath. > > </column> > > </group> > > </group> > > > > Hmm... well I already acked the first version of this patch. I didn't see > this one. > > In any case this looks fine too. > > Acked-by: Greg Rose <gvrose8192@gmail.com> Applied, thanks.
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index f9339af85edd..6d334370d252 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -6137,9 +6137,9 @@ ovs-vsctl add-port br0 p0 -- set Interface p0 type=patch options:peer=p1 \ </column> <column name="timeouts" key="icmp_reply"> - The timeout of the connection after an ICMP error is replied in - response to an ICMP packet. This timeout is only supported by - the userspace datapath. + The timeout of the connection when ICMP packets have been seen in + both direction. This timeout is only supported by the userspace + datapath. </column> </group> </group>
Currently the userspace datapath implements conntrack ICMP reply state as when ICMP packets have been seen on both directions. However, the description is defined as timeout of the connection after an ICMP error is replied in response to an ICMP packet. Fixes: 61a5264d60d0c ("ovs-vswitchd: Add Datapath, CT_Zone, and CT_Zone_Policy tables.") Signed-off-by: William Tu <u9012063@gmail.com> --- vswitchd/vswitch.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)