| Message ID | 20161101071053.12486-1-christophe.jaillet@wanadoo.fr |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 01/11/2016 09:10, Christophe JAILLET wrote: > 'create_root_ns()' does not return an error pointer, so the test can be > simplified to be more consistent. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c > index 904853f9cf7a..330955f6badc 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c > @@ -1833,7 +1833,7 @@ static int init_root_ns(struct mlx5_flow_steering *steering) > { > > steering->root_ns = create_root_ns(steering, FS_FT_NIC_RX); > - if (IS_ERR_OR_NULL(steering->root_ns)) > + if (!steering->root_ns) > goto cleanup; > > if (init_root_tree(steering, &root_fs, &steering->root_ns->ns.node)) > Thanks. Acked-by: Matan Barak <matanb@mellanox.com>
On 11/01/2016 09:10 AM, Christophe JAILLET wrote: > 'create_root_ns()' does not return an error pointer, so the test can be > simplified to be more consistent. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by: Saeed Mahameed <saeedm@mellanox.com>
From: Matan Barak <matanb@mellanox.com> Date: Tue, 1 Nov 2016 11:38:18 +0200 > On 01/11/2016 09:10, Christophe JAILLET wrote: >> 'create_root_ns()' does not return an error pointer, so the test can >> be >> simplified to be more consistent. >> >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> >> --- >> drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c >> b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c >> index 904853f9cf7a..330955f6badc 100644 >> --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c >> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c >> @@ -1833,7 +1833,7 @@ static int init_root_ns(struct >> mlx5_flow_steering *steering) >> { >> >> steering->root_ns = create_root_ns(steering, FS_FT_NIC_RX); >> - if (IS_ERR_OR_NULL(steering->root_ns)) >> + if (!steering->root_ns) >> goto cleanup; >> >> if (init_root_tree(steering, &root_fs, &steering->root_ns->ns.node)) >> > > Thanks. > Acked-by: Matan Barak <matanb@mellanox.com> > Applied.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c index 904853f9cf7a..330955f6badc 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c @@ -1833,7 +1833,7 @@ static int init_root_ns(struct mlx5_flow_steering *steering) { steering->root_ns = create_root_ns(steering, FS_FT_NIC_RX); - if (IS_ERR_OR_NULL(steering->root_ns)) + if (!steering->root_ns) goto cleanup; if (init_root_tree(steering, &root_fs, &steering->root_ns->ns.node))
'create_root_ns()' does not return an error pointer, so the test can be simplified to be more consistent. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)