svn commit: r343670 - in head/sys: dev/qlnx/qlnxe dev/qlnx/qlnxr modules/qlnx/qlnxr

[Conrad Meyer]

Author: cem
Date: Fri Feb  1 23:04:45 2019
New Revision: 343670
URL: https://svnweb.freebsd.org/changeset/base/343670

Log:
  qlnxr(4), qlnxe(4): Unbreak gcc build
  
  Remove redundant definitions and conditionalize Clang-specific CFLAGS.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/dev/qlnx/qlnxe/qlnx_rdma.h
  head/sys/dev/qlnx/qlnxr/qlnxr_verbs.c
  head/sys/modules/qlnx/qlnxr/Makefile

Modified: head/sys/dev/qlnx/qlnxe/qlnx_rdma.h
==============================================================================
--- head/sys/dev/qlnx/qlnxe/qlnx_rdma.h	Fri Feb  1 22:24:14 2019	(r343669)
+++ head/sys/dev/qlnx/qlnxe/qlnx_rdma.h	Fri Feb  1 23:04:45 2019	(r343670)
@@ -51,8 +51,6 @@ typedef struct qlnx_rdma_if qlnx_rdma_if_t;
 
 extern int qlnx_rdma_register_if(qlnx_rdma_if_t *rdma_if);
 extern int qlnx_rdma_deregister_if(qlnx_rdma_if_t *rdma_if);
-extern int qlnx_rdma_ll2_set_mac_filter(void *rdma_ctx, uint8_t *old_mac_address,
-                uint8_t *new_mac_address);
 
 #define QLNX_NUM_CNQ	1
 

Modified: head/sys/dev/qlnx/qlnxr/qlnxr_verbs.c
==============================================================================
--- head/sys/dev/qlnx/qlnxr/qlnxr_verbs.c	Fri Feb  1 22:24:14 2019	(r343669)
+++ head/sys/dev/qlnx/qlnxr/qlnxr_verbs.c	Fri Feb  1 23:04:45 2019	(r343670)
@@ -74,16 +74,6 @@ __FBSDID("$FreeBSD$");
 	((unsigned char *)&addr)[2], \
 	((unsigned char *)&addr)[3]
 
-struct ib_srq *qlnxr_create_srq(struct ib_pd *,
-		struct ib_srq_init_attr *,
-		struct ib_udata *);
-
-int qlnxr_destroy_srq(struct ib_srq *);
-
-int qlnxr_modify_srq(struct ib_srq *,
-		struct ib_srq_attr *,
-		enum ib_srq_attr_mask,
-		struct ib_udata *);
 static int
 qlnxr_check_srq_params(struct ib_pd *ibpd,
 	struct qlnxr_dev *dev,
@@ -99,19 +89,6 @@ static int
 qlnxr_alloc_srq_kernel_params(struct qlnxr_srq *srq,
 	struct qlnxr_dev *dev,
 	struct ib_srq_init_attr *init_attr);
-
-extern enum _ecore_status_t
-ecore_rdma_modify_srq(void *rdma_cxt,
-	struct ecore_rdma_modify_srq_in_params *in_params);
-
-extern enum _ecore_status_t
-ecore_rdma_destroy_srq(void *rdma_cxt,
-	struct ecore_rdma_destroy_srq_in_params *in_params);
-
-extern enum _ecore_status_t
-ecore_rdma_create_srq(void *rdma_cxt,
-	struct ecore_rdma_create_srq_in_params *in_params,
-	struct ecore_rdma_create_srq_out_params *out_params);
 
 
 static int

Modified: head/sys/modules/qlnx/qlnxr/Makefile
==============================================================================
--- head/sys/modules/qlnx/qlnxr/Makefile	Fri Feb  1 22:24:14 2019	(r343669)
+++ head/sys/modules/qlnx/qlnxr/Makefile	Fri Feb  1 23:04:45 2019	(r343670)
@@ -62,12 +62,14 @@ CFLAGS+= -DINET6 -DINET
 
 CWARNEXTRA += -Wno-cast-qual
 CWARNEXTRA += -Wno-unused-function
+.if ${COMPILER_TYPE} == "clang"
 CWARNEXTRA += -Wno-gnu-variable-sized-type-not-at-end
+.endif
 CWARNEXTRA += -Wno-missing-prototypes
-CWARNEXTRA += -Wno-constant-conversion
+CWARNEXTRA += ${NO_WCONSTANT_CONVERSION}
 CWARNEXTRA += -Wno-format
 
-CWARNEXTRA += -Wno-shift-sign-overflow
+CWARNEXTRA += ${NO_WSHIFT_COUNT_OVERFLOW}
 CWARNEXTRA += -Wno-empty-body
 
 CFLAGS += -DQLNX_DEBUG