| Message ID | 1449714462-31831-2-git-send-email-diproiettod@vmware.com |
|---|---|
| State | Accepted |
| Headers | show |
Acked-by: Jarno Rajahalme <jarno@ovn.org> > On Dec 9, 2015, at 6:27 PM, Daniele Di Proietto <diproiettod@vmware.com> wrote: > > This solves a crash in dp_netdev_flow_add(), when log level is debug. > > Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com> > --- > lib/dpif-netdev.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c > index a67ef05..3bf130d 100644 > --- a/lib/dpif-netdev.c > +++ b/lib/dpif-netdev.c > @@ -1993,6 +1993,7 @@ dp_netdev_flow_add(struct dp_netdev_pmd_thread *pmd, > struct match match; > struct ds ds = DS_EMPTY_INITIALIZER; > > + match.tun_md.valid = false; > match.flow = flow->flow; > miniflow_expand(&flow->cr.mask->mf, &match.wc.masks); > > @@ -3300,6 +3301,7 @@ fast_path_processing(struct dp_netdev_pmd_thread *pmd, > > miss_cnt++; > > + match.tun_md.valid = false; > miniflow_expand(&keys[i].mf, &match.flow); > > ofpbuf_clear(&actions); > -- > 2.1.4 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
Pushed to master and branch-2.5 On 10/12/2015 14:37, "Jarno Rajahalme" <jarno@ovn.org> wrote: >Acked-by: Jarno Rajahalme <jarno@ovn.org> Thanks! > >> On Dec 9, 2015, at 6:27 PM, Daniele Di Proietto >><diproiettod@vmware.com> wrote: >> >> This solves a crash in dp_netdev_flow_add(), when log level is debug. >> >> Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com> >> --- >> lib/dpif-netdev.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c >> index a67ef05..3bf130d 100644 >> --- a/lib/dpif-netdev.c >> +++ b/lib/dpif-netdev.c >> @@ -1993,6 +1993,7 @@ dp_netdev_flow_add(struct dp_netdev_pmd_thread >>*pmd, >> struct match match; >> struct ds ds = DS_EMPTY_INITIALIZER; >> >> + match.tun_md.valid = false; >> match.flow = flow->flow; >> miniflow_expand(&flow->cr.mask->mf, &match.wc.masks); >> >> @@ -3300,6 +3301,7 @@ fast_path_processing(struct dp_netdev_pmd_thread >>*pmd, >> >> miss_cnt++; >> >> + match.tun_md.valid = false; >> miniflow_expand(&keys[i].mf, &match.flow); >> >> ofpbuf_clear(&actions); >> -- >> 2.1.4 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> >>https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailm >>an_listinfo_dev&d=BQIFAg&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r= >>SmB5nZacmXNq0gKCC1s_Cw5yUNjxgD4v5kJqZ2uWLlE&m=aZ7WWoKcyhnhMvBW6_9iTH32KP4 >>KEMgcjKixvx4igoM&s=ypa0CabyWjFD10oHHku6IZuKiHLfyNjpS6O3xt6pAEY&e= >
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index a67ef05..3bf130d 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -1993,6 +1993,7 @@ dp_netdev_flow_add(struct dp_netdev_pmd_thread *pmd, struct match match; struct ds ds = DS_EMPTY_INITIALIZER; + match.tun_md.valid = false; match.flow = flow->flow; miniflow_expand(&flow->cr.mask->mf, &match.wc.masks); @@ -3300,6 +3301,7 @@ fast_path_processing(struct dp_netdev_pmd_thread *pmd, miss_cnt++; + match.tun_md.valid = false; miniflow_expand(&keys[i].mf, &match.flow); ofpbuf_clear(&actions);
This solves a crash in dp_netdev_flow_add(), when log level is debug. Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com> --- lib/dpif-netdev.c | 2 ++ 1 file changed, 2 insertions(+)