From: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Subject: kabi cxgb4 MU
Patch-Mainline: never, kABI
References: bsc#1097585 bsc#1097586 bsc#1097587 bsc#1097588 bsc#1097583 bsc#1097584

Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h     |   13 ++++++++++++-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h |   11 +++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -50,7 +50,9 @@
 #include <linux/net_tstamp.h>
 #include <linux/ptp_clock_kernel.h>
 #include <linux/ptp_classify.h>
+#ifndef __GENKSYMS__
 #include <linux/crash_dump.h>
+#endif
 #include <asm/io.h>
 #include "t4_chip_type.h"
 #include "cxgb4_uld.h"
@@ -313,7 +315,9 @@ struct vpd_params {
 };
 
 struct pci_params {
+#ifndef __GENKSYMS__
 	unsigned int vpd_cap_addr;
+#endif
 	unsigned char speed;
 	unsigned char width;
 };
@@ -384,8 +388,10 @@ struct adapter_params {
 	 * used by the Port
 	 */
 	u8 mps_bg_map[MAX_NPORTS];	/* MPS Buffer Group Map */
+#ifndef __GENKSYMS__
 	bool write_w_imm_support;       /* FW supports WRITE_WITH_IMMEDIATE */
 	bool write_cmpl_support;        /* FW supports WRITE_CMPL */
+#endif
 };
 
 /* State needed to monitor the forward progress of SGE Ingress DMA activities
@@ -826,7 +832,9 @@ struct vf_info {
 	unsigned char vf_mac_addr[ETH_ALEN];
 	unsigned int tx_rate;
 	bool pf_set_mac;
+#ifndef __GENKSYMS__
 	u16 vlan;
+#endif
 };
 
 enum {
@@ -915,7 +923,6 @@ struct adapter {
 	struct work_struct tid_release_task;
 	struct work_struct db_full_task;
 	struct work_struct db_drop_task;
-	struct work_struct fatal_err_notify_task;
 	bool tid_release_task_busy;
 
 	/* lock for mailbox cmd list */
@@ -954,6 +961,9 @@ struct adapter {
 	/* Ethtool Dump */
 	struct ethtool_dump eth_dump;
 
+#ifndef __GENKSYMS__
+	struct work_struct fatal_err_notify_task;
+
 	/* HMA */
 	struct hma_data hma;
 
@@ -961,6 +971,7 @@ struct adapter {
 
 	/* Dump buffer for collecting logs in kdump kernel */
 	struct vmcoredd_data vmcoredd;
+#endif
 };
 
 /* Support for "sched-class" command to allow a TX Scheduling Class to be
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
@@ -257,8 +257,11 @@ enum cxgb4_state {
 	CXGB4_STATE_UP,
 	CXGB4_STATE_START_RECOVERY,
 	CXGB4_STATE_DOWN,
-	CXGB4_STATE_DETACH,
+	CXGB4_STATE_DETACH
+#ifndef __GENKSYMS__
+	,
 	CXGB4_STATE_FATAL_ERROR
+#endif
 };
 
 enum cxgb4_control {
@@ -284,12 +287,14 @@ struct cxgb4_virt_res {
 	struct cxgb4_range iscsi;
 	struct cxgb4_range stag;
 	struct cxgb4_range rq;
-	struct cxgb4_range srq;
 	struct cxgb4_range pbl;
 	struct cxgb4_range qp;
 	struct cxgb4_range cq;
 	struct cxgb4_range ocq;
 	unsigned int ncrypto_fc;
+#ifndef __GENKSYMS__
+	struct cxgb4_range srq;
+#endif
 };
 
 struct chcr_stats_debug {
@@ -352,8 +357,10 @@ struct cxgb4_lld_info {
 	void **iscsi_ppm;		     /* iscsi page pod manager */
 	int nodeid;			     /* device numa node id */
 	bool fr_nsmr_tpte_wr_support;	     /* FW supports FR_NSMR_TPTE_WR */
+#ifndef __GENKSYMS__
 	bool write_w_imm_support;         /* FW supports WRITE_WITH_IMMEDIATE */
 	bool write_cmpl_support;             /* FW supports WRITE_CMPL WR */
+#endif
 };
 
 struct cxgb4_uld_info {