svn commit: r325638 - in head/sys: conf dev/mlx5 dev/mlx5/mlx5_core dev/mlx5/mlx5_en modules/mlx5

[Konstantin Belousov]

On Fri, Nov 10, 2017 at 09:49:08AM +0000, Hans Petter Selasky wrote:
> Author: hselasky
> Date: Fri Nov 10 09:49:08 2017
> New Revision: 325638
> URL: https://svnweb.freebsd.org/changeset/base/325638
> 
> Log:
>   Refactor the flowsteering APIs used by mlx5en(4). This change is needed by
>   the coming ibcore and mlx5ib updates in order to support traffic redirection
>   to so-called raw ethernet QPs.
>   
>   Remove unused E-switch related routines and files while at it.
>   

This seems to break on all gcc platforms.  I see
cc1: warnings being treated as errors
/root/deviant2/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c:2558: warning: redundant re
declaration of 'iterate_rules_in_ns' [-Wredundant-decls]
/root/deviant2/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c:2502: warning: previous dec
laration of 'iterate_rules_in_ns' was here
--- mlx5_fs_tree.o ---
*** [mlx5_fs_tree.o] Error code 1


Patch below should fix this item.  Are you fine with it ?

diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
index bf796d65b5f..d0ffa44387c 100644
--- a/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
+++ b/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
@@ -2553,10 +2553,6 @@ static void iterate_rules_in_ft(struct mlx5_flow_table *ft,
 	mutex_unlock(&ft->base.lock);
 }
 
-static void iterate_rules_in_ns(struct mlx5_flow_namespace *ns,
-				rule_event_fn add_rule_cb,
-				void *context);
-
 static void iterate_rules_in_prio(struct fs_prio *prio,
 				  rule_event_fn add_rule_cb,
 				  void *context)