Tuesday, April 2, 2019 12:22 AM, Yongseok Koh: > Subject: [PATCH v2 1/3] net/mlx5: fix recursive inclusion of header file > > mlx5.h includes mlx5_rxtx.h and mlx5_rxtx.h includes mlx5.h recursively. > > Signed-off-by: Yongseok Koh <ys...@mellanox.com>
Acked-by: Shahaf Shuler <shah...@mellanox.com> > --- > drivers/net/mlx5/mlx5.h | 1 - > drivers/net/mlx5/mlx5_flow.c | 5 +++-- > drivers/net/mlx5/mlx5_flow_dv.c | 3 ++- > drivers/net/mlx5/mlx5_flow_verbs.c | 5 +++-- > drivers/net/mlx5/mlx5_vlan.c | 3 ++- > 5 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index > 47a7d75f7a..8ce8361a85 100644 > --- a/drivers/net/mlx5/mlx5.h > +++ b/drivers/net/mlx5/mlx5.h > @@ -33,7 +33,6 @@ > > #include "mlx5_utils.h" > #include "mlx5_mr.h" > -#include "mlx5_rxtx.h" > #include "mlx5_autoconf.h" > #include "mlx5_defs.h" > > diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c > index bc6a7c1eba..3eb8bf0c83 100644 > --- a/drivers/net/mlx5/mlx5_flow.c > +++ b/drivers/net/mlx5/mlx5_flow.c > @@ -30,9 +30,10 @@ > > #include "mlx5.h" > #include "mlx5_defs.h" > -#include "mlx5_prm.h" > -#include "mlx5_glue.h" > #include "mlx5_flow.h" > +#include "mlx5_glue.h" > +#include "mlx5_prm.h" > +#include "mlx5_rxtx.h" > > /* Dev ops structure defined in mlx5.c */ extern const struct eth_dev_ops > mlx5_dev_ops; diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c index 966dad9838..3e0a64ec4b 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -29,9 +29,10 @@ > > #include "mlx5.h" > #include "mlx5_defs.h" > -#include "mlx5_prm.h" > #include "mlx5_glue.h" > #include "mlx5_flow.h" > +#include "mlx5_prm.h" > +#include "mlx5_rxtx.h" > > #ifdef HAVE_IBV_FLOW_DV_SUPPORT > > diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c > b/drivers/net/mlx5/mlx5_flow_verbs.c > index 49dd13e6d2..3956df1a7e 100644 > --- a/drivers/net/mlx5/mlx5_flow_verbs.c > +++ b/drivers/net/mlx5/mlx5_flow_verbs.c > @@ -29,9 +29,10 @@ > > #include "mlx5.h" > #include "mlx5_defs.h" > -#include "mlx5_prm.h" > -#include "mlx5_glue.h" > #include "mlx5_flow.h" > +#include "mlx5_glue.h" > +#include "mlx5_prm.h" > +#include "mlx5_rxtx.h" > > #define VERBS_SPEC_INNER(item_flags) \ > (!!((item_flags) & MLX5_FLOW_LAYER_TUNNEL) ? > IBV_FLOW_SPEC_INNER : 0) diff --git a/drivers/net/mlx5/mlx5_vlan.c > b/drivers/net/mlx5/mlx5_vlan.c index 6568a3a475..4004930942 100644 > --- a/drivers/net/mlx5/mlx5_vlan.c > +++ b/drivers/net/mlx5/mlx5_vlan.c > @@ -27,10 +27,11 @@ > #include <rte_ethdev_driver.h> > #include <rte_common.h> > > -#include "mlx5_utils.h" > #include "mlx5.h" > #include "mlx5_autoconf.h" > #include "mlx5_glue.h" > +#include "mlx5_rxtx.h" > +#include "mlx5_utils.h" > > /** > * DPDK callback to configure a VLAN filter. > -- > 2.11.0
