On Wed, Apr 6, 2022 at 12:29 PM Sean Morrissey <sean.morris...@intel.com> wrote: > > l3fwd-acl contains duplicate functions to l3fwd. > For this reason we merge l3fwd-acl code into l3fwd > with '--lookup acl' cmdline option to run ACL. > > Signed-off-by: Sean Morrissey <sean.morris...@intel.com> > --- > V3: > * remove unnecessary declarations > * move functions to correct files > V2: > * add doc changes > * minor code cleanup > --- > doc/guides/rel_notes/release_22_07.rst | 4 + > doc/guides/sample_app_ug/index.rst | 1 - > doc/guides/sample_app_ug/l3_forward.rst | 63 +- > .../sample_app_ug/l3_forward_access_ctrl.rst | 340 --- > examples/l3fwd-acl/Makefile | 51 - > examples/l3fwd-acl/main.c | 2272 ----------------- > examples/l3fwd-acl/meson.build | 13 - > examples/l3fwd/Makefile | 2 +- > examples/l3fwd/l3fwd.h | 39 +- > examples/l3fwd/l3fwd_acl.c | 1098 ++++++++ > examples/l3fwd/l3fwd_acl.h | 51 + > examples/l3fwd/l3fwd_acl_scalar.h | 112 + > examples/l3fwd/l3fwd_route.h | 16 + > examples/l3fwd/main.c | 65 +- > examples/l3fwd/meson.build | 3 +- > examples/meson.build | 1 - > 16 files changed, 1433 insertions(+), 2698 deletions(-) > delete mode 100644 doc/guides/sample_app_ug/l3_forward_access_ctrl.rst > delete mode 100644 examples/l3fwd-acl/Makefile > delete mode 100644 examples/l3fwd-acl/main.c > delete mode 100644 examples/l3fwd-acl/meson.build > create mode 100644 examples/l3fwd/l3fwd_acl.c > create mode 100644 examples/l3fwd/l3fwd_acl.h > create mode 100644 examples/l3fwd/l3fwd_acl_scalar.h
Two small comments. MAINTAINERS must be updated. It contains: F: examples/l3fwd-acl/ F: doc/guides/sample_app_ug/l3_forward_access_ctrl.rst > > diff --git a/doc/guides/rel_notes/release_22_07.rst > b/doc/guides/rel_notes/release_22_07.rst > index 42a5f2d990..351619f1ca 100644 > --- a/doc/guides/rel_notes/release_22_07.rst > +++ b/doc/guides/rel_notes/release_22_07.rst > @@ -55,6 +55,10 @@ New Features > Also, make sure to start the actual text at the margin. > ======================================================= > > +* **Merged l3fwd-acl into l3fwd.** > + > + Merged l3fwd-acl code into l3fwd as l3fwd-acl contains duplicate and > + common functions to l3fwd. Double empty line here. > > Removed Items > ------------- -- David Marchand
