svn commit: r324621 - head/sys/dev/mlx4/mlx4_en

[Ryan Libby]

Author: rlibby
Date: Sat Oct 14 23:25:44 2017
New Revision: 324621
URL: https://svnweb.freebsd.org/changeset/base/324621

Log:
  mlx4: use enum constants instead of const vars for case exprs
  
  Follow up from r324201 to fix compilation with gcc, which complains
  about non-ICE case expressions.
  
  Reviewed by:	hselasky
  Differential Revision:	https://reviews.freebsd.org/D12675

Modified:
  head/sys/dev/mlx4/mlx4_en/mlx4_en_rx.c

Modified: head/sys/dev/mlx4/mlx4_en/mlx4_en_rx.c
==============================================================================
--- head/sys/dev/mlx4/mlx4_en/mlx4_en_rx.c	Sat Oct 14 19:02:52 2017	(r324620)
+++ head/sys/dev/mlx4/mlx4_en/mlx4_en_rx.c	Sat Oct 14 23:25:44 2017	(r324621)
@@ -558,26 +558,28 @@ mlx4_en_rx_mb(struct mlx4_en_priv *priv, struct mlx4_e
 static __inline int
 mlx4_en_rss_hash(__be16 status, int udp_rss)
 {
-	const __be16 status_all = cpu_to_be16(
+	enum {
+		status_all = cpu_to_be16(
 			MLX4_CQE_STATUS_IPV4    |
 			MLX4_CQE_STATUS_IPV4F   |
 			MLX4_CQE_STATUS_IPV6    |
 			MLX4_CQE_STATUS_TCP     |
-			MLX4_CQE_STATUS_UDP);
-	const __be16 status_ipv4_tcp = cpu_to_be16(
+			MLX4_CQE_STATUS_UDP),
+		status_ipv4_tcp = cpu_to_be16(
 			MLX4_CQE_STATUS_IPV4    |
-			MLX4_CQE_STATUS_TCP);
-	const __be16 status_ipv6_tcp = cpu_to_be16(
+			MLX4_CQE_STATUS_TCP),
+		status_ipv6_tcp = cpu_to_be16(
 			MLX4_CQE_STATUS_IPV6    |
-			MLX4_CQE_STATUS_TCP);
-	const __be16 status_ipv4_udp = cpu_to_be16(
+			MLX4_CQE_STATUS_TCP),
+		status_ipv4_udp = cpu_to_be16(
 			MLX4_CQE_STATUS_IPV4    |
-			MLX4_CQE_STATUS_UDP);
-	const __be16 status_ipv6_udp = cpu_to_be16(
+			MLX4_CQE_STATUS_UDP),
+		status_ipv6_udp = cpu_to_be16(
 			MLX4_CQE_STATUS_IPV6    |
-			MLX4_CQE_STATUS_UDP);
-	const __be16 status_ipv4 = cpu_to_be16(MLX4_CQE_STATUS_IPV4);
-	const __be16 status_ipv6 = cpu_to_be16(MLX4_CQE_STATUS_IPV6);
+			MLX4_CQE_STATUS_UDP),
+		status_ipv4 = cpu_to_be16(MLX4_CQE_STATUS_IPV4),
+		status_ipv6 = cpu_to_be16(MLX4_CQE_STATUS_IPV6)
+	};
 
 	status &= status_all;
 	switch (status) {