Skip to contentSkip to conversation

staging: qlge: change prefix to qlge_*

PATCH In review Sidong Yang 2 participants 2 messages Apr 26, 2020 – Apr 28, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: qlge: change prefix to qlge_*

In terms of namespace, The driver uses either qlge_, ql_ or nothing. also there is macro using QL_. This can make crash with other qlogic drivers. Rename everything to use the qlge_ or QLGE_ prefix.

---
 drivers/staging/qlge/qlge.h         |  488 +++++------
 drivers/staging/qlge/qlge_dbg.c     |  638 +++++++-------
 drivers/staging/qlge/qlge_ethtool.c |  484 +++++------
 drivers/staging/qlge/qlge_main.c    | 1200 +++++++++++++--------------
 drivers/staging/qlge/qlge_mpi.c     |  386 ++++-----
 5 files changed, 1598 insertions(+), 1598 deletions(-)
drivers/staging/qlge/qlge.h +244 -244
index fc8c5ca8935d..a8da06c978ff 100644
@@ -955,7 +955,7 @@ enum {
 	MB_CMD_GET_PORT_CFG = 0x00000123,
 	MB_CMD_GET_LINK_STS = 0x00000124,
 	MB_CMD_SET_LED_CFG = 0x00000125, /* Set LED Configuration Register */
-		QL_LED_BLINK = 0x03e803e8,
+		QLGE_LED_BLINK = 0x03e803e8,
 	MB_CMD_GET_LED_CFG = 0x00000126, /* Get LED Configuration Register */
 	MB_CMD_SET_MGMNT_TFK_CTL = 0x00000160, /* Set Mgmnt Traffic Control */
 	MB_SET_MPI_TFK_STOP = (1 << 0),
@@ -986,14 +986,14 @@ enum {
 	MB_CMD_STS_PARAM_ERR = 0x00004006,	/* Parameter Error. */
 };
 
-struct mbox_params {
+struct qlge_mbox_params {
 	u32 mbox_in[MAILBOX_COUNT];
 	u32 mbox_out[MAILBOX_COUNT];
 	int in_count;
 	int out_count;
 };
 
-struct flash_params_8012 {
+struct qlge_flash_params_8012 {
 	u8 dev_id_str[4];
 	__le16 size;
 	__le16 csum;
@@ -1010,7 +1010,7 @@ struct flash_params_8012 {
 #define FUNC1_FLASH_OFFSET 0x140600
 
 /* Flash related data structures. */
-struct flash_params_8000 {
+struct qlge_flash_params_8000 {
 	u8 dev_id_str[4];	/* "8000" */
 	__le16 ver;
 	__le16 size;
@@ -1036,15 +1036,15 @@ struct flash_params_8000 {
 	u8 reserved2[4];
 };
 
-union flash_params {
-	struct flash_params_8012 flash_params_8012;
-	struct flash_params_8000 flash_params_8000;
+union qlge_flash_params {
+	struct qlge_flash_params_8012 flash_params_8012;
+	struct qlge_flash_params_8000 flash_params_8000;
 };
 
 /*
  * doorbell space for the rx ring context
  */
-struct rx_doorbell_context {
+struct qlge_rx_doorbell_context {
 	u32 cnsmr_idx;		/* 0x00 */
 	u32 valid;		/* 0x04 */
 	u32 reserved[4];	/* 0x08-0x14 */
@@ -1055,7 +1055,7 @@ struct rx_doorbell_context {
 /*
  * doorbell space for the tx ring context
  */
-struct tx_doorbell_context {
+struct qlge_tx_doorbell_context {
 	u32 prod_idx;		/* 0x00 */
 	u32 valid;		/* 0x04 */
 	u32 reserved[4];	/* 0x08-0x14 */
@@ -1064,7 +1064,7 @@ struct tx_doorbell_context {
 };
 
 /* DATA STRUCTURES SHARED WITH HARDWARE. */
-struct tx_buf_desc {
+struct qlge_tx_buf_desc {
 	__le64 addr;
 	__le32 len;
 #define TX_DESC_LEN_MASK	0x000fffff
@@ -1082,7 +1082,7 @@ struct tx_buf_desc {
 #define OPCODE_IB_MPI_IOCB		0x21
 #define OPCODE_IB_AE_IOCB		0x3f
 
-struct ob_mac_iocb_req {
+struct qlge_ob_mac_iocb_req {
 	u8 opcode;
 	u8 flags1;
 #define OB_MAC_IOCB_REQ_OI	0x01
@@ -1102,10 +1102,10 @@ struct ob_mac_iocb_req {
 	__le32 reserved3;
 	__le16 vlan_tci;
 	__le16 reserved4;
-	struct tx_buf_desc tbd[TX_DESC_PER_IOCB];
+	struct qlge_tx_buf_desc tbd[TX_DESC_PER_IOCB];
 } __packed;
 
-struct ob_mac_iocb_rsp {
+struct qlge_ob_mac_iocb_rsp {
 	u8 opcode;		/* */
 	u8 flags1;		/* */
 #define OB_MAC_IOCB_RSP_OI	0x01	/* */
@@ -1122,7 +1122,7 @@ struct ob_mac_iocb_rsp {
 	__le32 reserved[13];
 } __packed;
 
-struct ob_mac_tso_iocb_req {
+struct qlge_ob_mac_tso_iocb_req {
 	u8 opcode;
 	u8 flags1;
 #define OB_MAC_TSO_IOCB_OI	0x01
@@ -1147,10 +1147,10 @@ struct ob_mac_tso_iocb_req {
 #define OB_MAC_TRANSPORT_HDR_SHIFT 6
 	__le16 vlan_tci;
 	__le16 mss;
-	struct tx_buf_desc tbd[TX_DESC_PER_IOCB];
+	struct qlge_tx_buf_desc tbd[TX_DESC_PER_IOCB];
 } __packed;
 
-struct ob_mac_tso_iocb_rsp {
+struct qlge_ob_mac_tso_iocb_rsp {
 	u8 opcode;
 	u8 flags1;
 #define OB_MAC_TSO_IOCB_RSP_OI	0x01
@@ -1167,7 +1167,7 @@ struct ob_mac_tso_iocb_rsp {
 	__le32 reserved2[13];
 } __packed;
 
-struct ib_mac_iocb_rsp {
+struct qlge_ib_mac_iocb_rsp {
 	u8 opcode;		/* 0x20 */
 	u8 flags1;
 #define IB_MAC_IOCB_RSP_OI	0x01	/* Override intr delay */
@@ -1226,7 +1226,7 @@ struct ib_mac_iocb_rsp {
 	__le64 hdr_addr;	/* */
 } __packed;
 
-struct ib_ae_iocb_rsp {
+struct qlge_ib_ae_iocb_rsp {
 	u8 opcode;
 	u8 flags1;
 #define IB_AE_IOCB_RSP_OI		0x01
@@ -1251,7 +1251,7 @@ struct ib_ae_iocb_rsp {
  * These three structures are for generic
  * handling of ib and ob iocbs.
  */
-struct ql_net_rsp_iocb {
+struct qlge_net_rsp_iocb {
 	u8 opcode;
 	u8 flags0;
 	__le16 length;
@@ -1259,7 +1259,7 @@ struct ql_net_rsp_iocb {
 	__le32 reserved[14];
 } __packed;
 
-struct net_req_iocb {
+struct qlge_net_req_iocb {
 	u8 opcode;
 	u8 flags0;
 	__le16 flags1;
@@ -1272,7 +1272,7 @@ struct net_req_iocb {
  * It is defined as:
  * "Work Queue Initialization Control Block"
  */
-struct wqicb {
+struct qlge_wqicb {
 	__le16 len;
 #define Q_LEN_V		(1 << 4)
 #define Q_LEN_CPP_CONT	0x0000
@@ -1298,7 +1298,7 @@ struct wqicb {
  * It is defined as:
  * "Completion Queue Initialization Control Block"
  */
-struct cqicb {
+struct qlge_cqicb {
 	u8 msix_vect;
 	u8 reserved1;
 	u8 reserved2;
@@ -1327,7 +1327,7 @@ struct cqicb {
 	__le16 sbq_len;		/* entry count */
 } __packed;
 
-struct ricb {
+struct qlge_ricb {
 	u8 base_cq;
 #define RSS_L4K 0x80
 	u8 flags;
@@ -1347,32 +1347,32 @@ struct ricb {
 
 /* SOFTWARE/DRIVER DATA STRUCTURES. */
 
-struct oal {
-	struct tx_buf_desc oal[TX_DESC_PER_OAL];
+struct qlge_oal {
+	struct qlge_tx_buf_desc oal[TX_DESC_PER_OAL];
 };
 
-struct map_list {
+struct qlge_map_list {
 	DEFINE_DMA_UNMAP_ADDR(mapaddr);
 	DEFINE_DMA_UNMAP_LEN(maplen);
 };
 
-struct tx_ring_desc {
+struct qlge_tx_ring_desc {
 	struct sk_buff *skb;
-	struct ob_mac_iocb_req *queue_entry;
+	struct qlge_ob_mac_iocb_req *queue_entry;
 	u32 index;
-	struct oal oal;
-	struct map_list map[MAX_SKB_FRAGS + 2];
+	struct qlge_oal oal;
+	struct qlge_map_list map[MAX_SKB_FRAGS + 2];
 	int map_cnt;
-	struct tx_ring_desc *next;
+	struct qlge_tx_ring_desc *next;
 };
 
-#define QL_TXQ_IDX(qdev, skb) (smp_processor_id() % (qdev->tx_ring_count))
+#define QLGE_TXQ_IDX(qdev, skb) (smp_processor_id() % (qdev->tx_ring_count))
 
-struct tx_ring {
+struct qlge_tx_ring {
 	/*
 	 * queue info.
 	 */
-	struct wqicb wqicb;	/* structure used to inform chip of new queue */
+	struct qlge_wqicb wqicb;	/* structure used to inform chip of new queue */
 	void *wq_base;		/* pci_alloc:virtual addr for tx */
 	dma_addr_t wq_base_dma;	/* pci_alloc:dma addr for tx */
 	__le32 *cnsmr_idx_sh_reg;	/* shadow copy of consumer idx */
@@ -1385,11 +1385,11 @@ struct tx_ring {
 	u16 cq_id;		/* completion (rx) queue for tx completions */
 	u8 wq_id;		/* queue id for this entry */
 	u8 reserved1[3];
-	struct tx_ring_desc *q;	/* descriptor list for the queue */
+	struct qlge_tx_ring_desc *q;	/* descriptor list for the queue */
 	spinlock_t lock;
 	atomic_t tx_count;	/* counts down for every outstanding IO */
 	struct delayed_work tx_work;
-	struct ql_adapter *qdev;
+	struct qlge_adapter *qdev;
 	u64 tx_packets;
 	u64 tx_bytes;
 	u64 tx_errors;
@@ -1438,9 +1438,9 @@ struct qlge_bq {
 #define QLGE_BQ_CONTAINER(bq) \
 ({ \
 	typeof(bq) _bq = bq; \
-	(struct rx_ring *)((char *)_bq - (_bq->type == QLGE_SB ? \
-					  offsetof(struct rx_ring, sbq) : \
-					  offsetof(struct rx_ring, lbq))); \
+	(struct qlge_rx_ring *)((char *)_bq - (_bq->type == QLGE_SB ? \
+					  offsetof(struct qlge_rx_ring, sbq) : \
+					  offsetof(struct qlge_rx_ring, lbq))); \
 })
 
 /* Experience shows that the device ignores the low 4 bits of the tail index.
@@ -1457,8 +1457,8 @@ struct qlge_bq {
 		     (_bq)->next_to_clean); \
 })
 
-struct rx_ring {
-	struct cqicb cqicb;	/* The chip's completion queue init control block. */
+struct qlge_rx_ring {
+	struct qlge_cqicb cqicb;	/* The chip's completion queue init control block. */
 
 	/* Completion queue elements. */
 	void *cq_base;
@@ -1470,7 +1470,7 @@ struct rx_ring {
 	dma_addr_t prod_idx_sh_reg_dma;
 	void __iomem *cnsmr_idx_db_reg;	/* PCI doorbell mem area + 0 */
 	u32 cnsmr_idx;		/* current sw idx */
-	struct ql_net_rsp_iocb *curr_entry;	/* next entry on queue */
+	struct qlge_net_rsp_iocb *curr_entry;	/* next entry on queue */
 	void __iomem *valid_db_reg;	/* PCI doorbell mem area + 0x04 */
 
 	/* Large buffer queue elements. */
@@ -1488,7 +1488,7 @@ struct rx_ring {
 	char name[IFNAMSIZ + 5];
 	struct napi_struct napi;
 	u8 reserved;
-	struct ql_adapter *qdev;
+	struct qlge_adapter *qdev;
 	u64 rx_packets;
 	u64 rx_multicast;
 	u64 rx_bytes;
@@ -1499,11 +1499,11 @@ struct rx_ring {
 /*
  * RSS Initialization Control Block
  */
-struct hash_id {
+struct qlge_hash_id {
 	u8 value[4];
 };
 
-struct nic_stats {
+struct qlge_nic_stats {
 	/*
 	 * These stats come from offset 200h to 278h
 	 * in the XGMAC register.
@@ -1623,7 +1623,7 @@ enum {
 };
 
 #define MPI_COREDUMP_COOKIE 0x5555aaaa
-struct mpi_coredump_global_header {
+struct qlge_mpi_coredump_global_header {
 	u32	cookie;
 	u8	id_string[16];
 	u32	time_lo;
@@ -1633,7 +1633,7 @@ struct mpi_coredump_global_header {
 	u8	info[220];
 };
 
-struct mpi_coredump_segment_header {
+struct qlge_mpi_coredump_segment_header {
 	u32	cookie;
 	u32	seg_num;
 	u32	seg_size;
@@ -1753,236 +1753,236 @@ enum {
 #define SHADOW_OFFSET	0xb0000000
 #define SHADOW_REG_SHIFT	20
 
-struct ql_nic_misc {
+struct qlge_nic_misc {
 	u32 rx_ring_count;
 	u32 tx_ring_count;
 	u32 intr_count;
 	u32 function;
 };
 
-struct ql_reg_dump {
+struct qlge_reg_dump {
 	/* segment 0 */
-	struct mpi_coredump_global_header mpi_global_header;
+	struct qlge_mpi_coredump_global_header mpi_global_header;
 
 	/* segment 16 */
-	struct mpi_coredump_segment_header nic_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header nic_regs_seg_hdr;
 	u32 nic_regs[64];
 
 	/* segment 30 */
-	struct mpi_coredump_segment_header misc_nic_seg_hdr;
-	struct ql_nic_misc misc_nic_info;
+	struct qlge_mpi_coredump_segment_header misc_nic_seg_hdr;
+	struct qlge_nic_misc misc_nic_info;
 
 	/* segment 31 */
 	/* one interrupt state for each CQ */
-	struct mpi_coredump_segment_header intr_states_seg_hdr;
+	struct qlge_mpi_coredump_segment_header intr_states_seg_hdr;
 	u32 intr_states[MAX_CPUS];
 
 	/* segment 32 */
 	/* 3 cam words each for 16 unicast,
 	 * 2 cam words for each of 32 multicast.
 	 */
-	struct mpi_coredump_segment_header cam_entries_seg_hdr;
+	struct qlge_mpi_coredump_segment_header cam_entries_seg_hdr;
 	u32 cam_entries[(16 * 3) + (32 * 3)];
 
 	/* segment 33 */
-	struct mpi_coredump_segment_header nic_routing_words_seg_hdr;
+	struct qlge_mpi_coredump_segment_header nic_routing_words_seg_hdr;
 	u32 nic_routing_words[16];
 
 	/* segment 34 */
-	struct mpi_coredump_segment_header ets_seg_hdr;
+	struct qlge_mpi_coredump_segment_header ets_seg_hdr;
 	u32 ets[8 + 2];
 };
 
-struct ql_mpi_coredump {
+struct qlge_mpi_coredump {
 	/* segment 0 */
-	struct mpi_coredump_global_header mpi_global_header;
+	struct qlge_mpi_coredump_global_header mpi_global_header;
 
 	/* segment 1 */
-	struct mpi_coredump_segment_header core_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header core_regs_seg_hdr;
 	u32 mpi_core_regs[MPI_CORE_REGS_CNT];
 	u32 mpi_core_sh_regs[MPI_CORE_SH_REGS_CNT];
 
 	/* segment 2 */
-	struct mpi_coredump_segment_header test_logic_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header test_logic_regs_seg_hdr;
 	u32 test_logic_regs[TEST_REGS_CNT];
 
 	/* segment 3 */
-	struct mpi_coredump_segment_header rmii_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header rmii_regs_seg_hdr;
 	u32 rmii_regs[RMII_REGS_CNT];
 
 	/* segment 4 */
-	struct mpi_coredump_segment_header fcmac1_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header fcmac1_regs_seg_hdr;
 	u32 fcmac1_regs[FCMAC_REGS_CNT];
 
 	/* segment 5 */
-	struct mpi_coredump_segment_header fcmac2_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header fcmac2_regs_seg_hdr;
 	u32 fcmac2_regs[FCMAC_REGS_CNT];
 
 	/* segment 6 */
-	struct mpi_coredump_segment_header fc1_mbx_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header fc1_mbx_regs_seg_hdr;
 	u32 fc1_mbx_regs[FC_MBX_REGS_CNT];
 
 	/* segment 7 */
-	struct mpi_coredump_segment_header ide_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header ide_regs_seg_hdr;
 	u32 ide_regs[IDE_REGS_CNT];
 
 	/* segment 8 */
-	struct mpi_coredump_segment_header nic1_mbx_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header nic1_mbx_regs_seg_hdr;
 	u32 nic1_mbx_regs[NIC_MBX_REGS_CNT];
 
 	/* segment 9 */
-	struct mpi_coredump_segment_header smbus_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header smbus_regs_seg_hdr;
 	u32 smbus_regs[SMBUS_REGS_CNT];
 
 	/* segment 10 */
-	struct mpi_coredump_segment_header fc2_mbx_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header fc2_mbx_regs_seg_hdr;
 	u32 fc2_mbx_regs[FC_MBX_REGS_CNT];
 
 	/* segment 11 */
-	struct mpi_coredump_segment_header nic2_mbx_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header nic2_mbx_regs_seg_hdr;
 	u32 nic2_mbx_regs[NIC_MBX_REGS_CNT];
 
 	/* segment 12 */
-	struct mpi_coredump_segment_header i2c_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header i2c_regs_seg_hdr;
 	u32 i2c_regs[I2C_REGS_CNT];
 	/* segment 13 */
-	struct mpi_coredump_segment_header memc_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header memc_regs_seg_hdr;
 	u32 memc_regs[MEMC_REGS_CNT];
 
 	/* segment 14 */
-	struct mpi_coredump_segment_header pbus_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header pbus_regs_seg_hdr;
 	u32 pbus_regs[PBUS_REGS_CNT];
 
 	/* segment 15 */
-	struct mpi_coredump_segment_header mde_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header mde_regs_seg_hdr;
 	u32 mde_regs[MDE_REGS_CNT];
 
 	/* segment 16 */
-	struct mpi_coredump_segment_header nic_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header nic_regs_seg_hdr;
 	u32 nic_regs[NIC_REGS_DUMP_WORD_COUNT];
 
 	/* segment 17 */
-	struct mpi_coredump_segment_header nic2_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header nic2_regs_seg_hdr;
 	u32 nic2_regs[NIC_REGS_DUMP_WORD_COUNT];
 
 	/* segment 18 */
-	struct mpi_coredump_segment_header xgmac1_seg_hdr;
+	struct qlge_mpi_coredump_segment_header xgmac1_seg_hdr;
 	u32 xgmac1[XGMAC_DUMP_WORD_COUNT];
 
 	/* segment 19 */
-	struct mpi_coredump_segment_header xgmac2_seg_hdr;
+	struct qlge_mpi_coredump_segment_header xgmac2_seg_hdr;
 	u32 xgmac2[XGMAC_DUMP_WORD_COUNT];
 
 	/* segment 20 */
-	struct mpi_coredump_segment_header code_ram_seg_hdr;
+	struct qlge_mpi_coredump_segment_header code_ram_seg_hdr;
 	u32 code_ram[CODE_RAM_CNT];
 
 	/* segment 21 */
-	struct mpi_coredump_segment_header memc_ram_seg_hdr;
+	struct qlge_mpi_coredump_segment_header memc_ram_seg_hdr;
 	u32 memc_ram[MEMC_RAM_CNT];
 
 	/* segment 22 */
-	struct mpi_coredump_segment_header xaui_an_hdr;
+	struct qlge_mpi_coredump_segment_header xaui_an_hdr;
 	u32 serdes_xaui_an[XG_SERDES_XAUI_AN_COUNT];
 
 	/* segment 23 */
-	struct mpi_coredump_segment_header xaui_hss_pcs_hdr;
+	struct qlge_mpi_coredump_segment_header xaui_hss_pcs_hdr;
 	u32 serdes_xaui_hss_pcs[XG_SERDES_XAUI_HSS_PCS_COUNT];
 
 	/* segment 24 */
-	struct mpi_coredump_segment_header xfi_an_hdr;
+	struct qlge_mpi_coredump_segment_header xfi_an_hdr;
 	u32 serdes_xfi_an[XG_SERDES_XFI_AN_COUNT];
 
 	/* segment 25 */
-	struct mpi_coredump_segment_header xfi_train_hdr;
+	struct qlge_mpi_coredump_segment_header xfi_train_hdr;
 	u32 serdes_xfi_train[XG_SERDES_XFI_TRAIN_COUNT];
 
 	/* segment 26 */
-	struct mpi_coredump_segment_header xfi_hss_pcs_hdr;
+	struct qlge_mpi_coredump_segment_header xfi_hss_pcs_hdr;
 	u32 serdes_xfi_hss_pcs[XG_SERDES_XFI_HSS_PCS_COUNT];
 
 	/* segment 27 */
-	struct mpi_coredump_segment_header xfi_hss_tx_hdr;
+	struct qlge_mpi_coredump_segment_header xfi_hss_tx_hdr;
 	u32 serdes_xfi_hss_tx[XG_SERDES_XFI_HSS_TX_COUNT];
 
 	/* segment 28 */
-	struct mpi_coredump_segment_header xfi_hss_rx_hdr;
+	struct qlge_mpi_coredump_segment_header xfi_hss_rx_hdr;
 	u32 serdes_xfi_hss_rx[XG_SERDES_XFI_HSS_RX_COUNT];
 
 	/* segment 29 */
-	struct mpi_coredump_segment_header xfi_hss_pll_hdr;
+	struct qlge_mpi_coredump_segment_header xfi_hss_pll_hdr;
 	u32 serdes_xfi_hss_pll[XG_SERDES_XFI_HSS_PLL_COUNT];
 
 	/* segment 30 */
-	struct mpi_coredump_segment_header misc_nic_seg_hdr;
-	struct ql_nic_misc misc_nic_info;
+	struct qlge_mpi_coredump_segment_header misc_nic_seg_hdr;
+	struct qlge_nic_misc misc_nic_info;
 
 	/* segment 31 */
 	/* one interrupt state for each CQ */
-	struct mpi_coredump_segment_header intr_states_seg_hdr;
+	struct qlge_mpi_coredump_segment_header intr_states_seg_hdr;
 	u32 intr_states[MAX_RX_RINGS];
 
 	/* segment 32 */
 	/* 3 cam words each for 16 unicast,
 	 * 2 cam words for each of 32 multicast.
 	 */
-	struct mpi_coredump_segment_header cam_entries_seg_hdr;
+	struct qlge_mpi_coredump_segment_header cam_entries_seg_hdr;
 	u32 cam_entries[(16 * 3) + (32 * 3)];
 
 	/* segment 33 */
-	struct mpi_coredump_segment_header nic_routing_words_seg_hdr;
+	struct qlge_mpi_coredump_segment_header nic_routing_words_seg_hdr;
 	u32 nic_routing_words[16];
 	/* segment 34 */
-	struct mpi_coredump_segment_header ets_seg_hdr;
+	struct qlge_mpi_coredump_segment_header ets_seg_hdr;
 	u32 ets[ETS_REGS_DUMP_WORD_COUNT];
 
 	/* segment 35 */
-	struct mpi_coredump_segment_header probe_dump_seg_hdr;
+	struct qlge_mpi_coredump_segment_header probe_dump_seg_hdr;
 	u32 probe_dump[PRB_MX_DUMP_TOT_COUNT];
 
 	/* segment 36 */
-	struct mpi_coredump_segment_header routing_reg_seg_hdr;
+	struct qlge_mpi_coredump_segment_header routing_reg_seg_hdr;
 	u32 routing_regs[RT_IDX_DUMP_TOT_WORDS];
 
 	/* segment 37 */
-	struct mpi_coredump_segment_header mac_prot_reg_seg_hdr;
+	struct qlge_mpi_coredump_segment_header mac_prot_reg_seg_hdr;
 	u32 mac_prot_regs[MAC_ADDR_DUMP_TOT_WORDS];
 
 	/* segment 38 */
-	struct mpi_coredump_segment_header xaui2_an_hdr;
+	struct qlge_mpi_coredump_segment_header xaui2_an_hdr;
 	u32 serdes2_xaui_an[XG_SERDES_XAUI_AN_COUNT];
 
 	/* segment 39 */
-	struct mpi_coredump_segment_header xaui2_hss_pcs_hdr;
+	struct qlge_mpi_coredump_segment_header xaui2_hss_pcs_hdr;
 	u32 serdes2_xaui_hss_pcs[XG_SERDES_XAUI_HSS_PCS_COUNT];
 
 	/* segment 40 */
-	struct mpi_coredump_segment_header xfi2_an_hdr;
+	struct qlge_mpi_coredump_segment_header xfi2_an_hdr;
 	u32 serdes2_xfi_an[XG_SERDES_XFI_AN_COUNT];
 
 	/* segment 41 */
-	struct mpi_coredump_segment_header xfi2_train_hdr;
+	struct qlge_mpi_coredump_segment_header xfi2_train_hdr;
 	u32 serdes2_xfi_train[XG_SERDES_XFI_TRAIN_COUNT];
 
 	/* segment 42 */
-	struct mpi_coredump_segment_header xfi2_hss_pcs_hdr;
+	struct qlge_mpi_coredump_segment_header xfi2_hss_pcs_hdr;
 	u32 serdes2_xfi_hss_pcs[XG_SERDES_XFI_HSS_PCS_COUNT];
 
 	/* segment 43 */
-	struct mpi_coredump_segment_header xfi2_hss_tx_hdr;
+	struct qlge_mpi_coredump_segment_header xfi2_hss_tx_hdr;
 	u32 serdes2_xfi_hss_tx[XG_SERDES_XFI_HSS_TX_COUNT];
 
 	/* segment 44 */
-	struct mpi_coredump_segment_header xfi2_hss_rx_hdr;
+	struct qlge_mpi_coredump_segment_header xfi2_hss_rx_hdr;
 	u32 serdes2_xfi_hss_rx[XG_SERDES_XFI_HSS_RX_COUNT];
 
 	/* segment 45 */
-	struct mpi_coredump_segment_header xfi2_hss_pll_hdr;
+	struct qlge_mpi_coredump_segment_header xfi2_hss_pll_hdr;
 	u32 serdes2_xfi_hss_pll[XG_SERDES_XFI_HSS_PLL_COUNT];
 
 	/* segment 50 */
 	/* semaphore register for all 5 functions */
-	struct mpi_coredump_segment_header sem_regs_seg_hdr;
+	struct qlge_mpi_coredump_segment_header sem_regs_seg_hdr;
 	u32 sem_regs[MAX_SEMAPHORE_FUNCTIONS];
 };
 
@@ -1991,8 +1991,8 @@ struct ql_mpi_coredump {
  * to hook the interrupts.  It is also used in a single
  * irq environment as a context to the ISR.
  */
-struct intr_context {
-	struct ql_adapter *qdev;
+struct qlge_intr_context {
+	struct qlge_adapter *qdev;
 	u32 intr;
 	u32 irq_mask;		/* Mask of which rings the vector services. */
 	u32 hooked;
@@ -2005,20 +2005,20 @@ struct intr_context {
 
 /* adapter flags definitions. */
 enum {
-	QL_ADAPTER_UP = 0,	/* Adapter has been brought up. */
-	QL_LEGACY_ENABLED = 1,
-	QL_MSI_ENABLED = 2,
-	QL_MSIX_ENABLED = 3,
-	QL_DMA64 = 4,
-	QL_PROMISCUOUS = 5,
-	QL_ALLMULTI = 6,
-	QL_PORT_CFG = 7,
-	QL_CAM_RT_SET = 8,
-	QL_SELFTEST = 9,
-	QL_LB_LINK_UP = 10,
-	QL_FRC_COREDUMP = 11,
-	QL_EEH_FATAL = 12,
-	QL_ASIC_RECOVERY = 14, /* We are in ascic recovery. */
+	QLGE_ADAPTER_UP = 0,	/* Adapter has been brought up. */
+	QLGE_LEGACY_ENABLED = 1,
+	QLGE_MSI_ENABLED = 2,
+	QLGE_MSIX_ENABLED = 3,
+	QLGE_DMA64 = 4,
+	QLGE_PROMISCUOUS = 5,
+	QLGE_ALLMULTI = 6,
+	QLGE_PORT_CFG = 7,
+	QLGE_CAM_RT_SET = 8,
+	QLGE_SELFTEST = 9,
+	QLGE_LB_LINK_UP = 10,
+	QLGE_FRC_COREDUMP = 11,
+	QLGE_EEH_FATAL = 12,
+	QLGE_ASIC_RECOVERY = 14, /* We are in ascic recovery. */
 };
 
 /* link_status bit definitions */
@@ -2056,21 +2056,21 @@ enum {
 	CFG_DEFAULT_MAX_FRAME_SIZE = 0x00002580,
 };
 
-struct nic_operations {
-	int (*get_flash) (struct ql_adapter *);
-	int (*port_initialize) (struct ql_adapter *);
+struct qlge_nic_operations {
+	int (*get_flash) (struct qlge_adapter *);
+	int (*port_initialize) (struct qlge_adapter *);
 };
 
 /*
  * The main Adapter structure definition.
  * This structure has all fields relevant to the hardware.
  */
-struct ql_adapter {
-	struct ricb ricb;
+struct qlge_adapter {
+	struct qlge_ricb ricb;
 	unsigned long flags;
 	u32 wol;
 
-	struct nic_stats nic_stats;
+	struct qlge_nic_stats nic_stats;
 
 	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
 
@@ -2103,14 +2103,14 @@ struct ql_adapter {
 
 	u32 mailbox_in;
 	u32 mailbox_out;
-	struct mbox_params idc_mbc;
+	struct qlge_mbox_params idc_mbc;
 	struct mutex	mpi_mutex;
 
 	int tx_ring_size;
 	int rx_ring_size;
 	u32 intr_count;
 	struct msix_entry *msi_x_entry;
-	struct intr_context intr_context[MAX_RX_RINGS];
+	struct qlge_intr_context intr_context[MAX_RX_RINGS];
 
 	int tx_ring_count;	/* One per online CPU. */
 	u32 rss_ring_count;	/* One per irq vector.  */
@@ -2123,8 +2123,8 @@ struct ql_adapter {
 	int ring_mem_size;
 	void *ring_mem;
 
-	struct rx_ring rx_ring[MAX_RX_RINGS];
-	struct tx_ring tx_ring[MAX_TX_RINGS];
+	struct qlge_rx_ring rx_ring[MAX_RX_RINGS];
+	struct qlge_tx_ring tx_ring[MAX_TX_RINGS];
 	unsigned int lbq_buf_order;
 	u32 lbq_buf_size;
 
@@ -2140,13 +2140,13 @@ struct ql_adapter {
 	u32 port_link_up;
 	u32 port_init;
 	u32 link_status;
-	struct ql_mpi_coredump *mpi_coredump;
+	struct qlge_mpi_coredump *mpi_coredump;
 	u32 core_is_dumped;
 	u32 link_config;
 	u32 led_config;
 	u32 max_frame_size;
 
-	union flash_params flash;
+	union qlge_flash_params flash;
 
 	struct workqueue_struct *workqueue;
 	struct delayed_work asic_reset_work;
@@ -2156,7 +2156,7 @@ struct ql_adapter {
 	struct delayed_work mpi_idc_work;
 	struct delayed_work mpi_core_to_log;
 	struct completion ide_completion;
-	const struct nic_operations *nic_ops;
+	const struct qlge_nic_operations *nic_ops;
 	u16 device_id;
 	struct timer_list timer;
 	atomic_t lb_count;
@@ -2167,7 +2167,7 @@ struct ql_adapter {
 /*
  * Typical Register accessor for memory mapped device.
  */
-static inline u32 ql_read32(const struct ql_adapter *qdev, int reg)
+static inline u32 qlge_read32(const struct qlge_adapter *qdev, int reg)
 {
 	return readl(qdev->reg_base + reg);
 }
@@ -2175,7 +2175,7 @@ static inline u32 ql_read32(const struct ql_adapter *qdev, int reg)
 /*
  * Typical Register accessor for memory mapped device.
  */
-static inline void ql_write32(const struct ql_adapter *qdev, int reg, u32 val)
+static inline void qlge_write32(const struct qlge_adapter *qdev, int reg, u32 val)
 {
 	writel(val, qdev->reg_base + reg);
 }
@@ -2190,7 +2190,7 @@ static inline void ql_write32(const struct ql_adapter *qdev, int reg, u32 val)
  * 1 4k chunk of memory.  The lower half of the space is for outbound
  * queues. The upper half is for inbound queues.
  */
-static inline void ql_write_db_reg(u32 val, void __iomem *addr)
+static inline void qlge_write_db_reg(u32 val, void __iomem *addr)
 {
 	writel(val, addr);
 }
@@ -2206,7 +2206,7 @@ static inline void ql_write_db_reg(u32 val, void __iomem *addr)
  * queues. The upper half is for inbound queues.
  * Caller has to guarantee ordering.
  */
-static inline void ql_write_db_reg_relaxed(u32 val, void __iomem *addr)
+static inline void qlge_write_db_reg_relaxed(u32 val, void __iomem *addr)
 {
 	writel_relaxed(val, addr);
 }
@@ -2221,7 +2221,7 @@ static inline void ql_write_db_reg_relaxed(u32 val, void __iomem *addr)
  * update the relevant index register and then copy the value to the
  * shadow register in host memory.
  */
-static inline u32 ql_read_sh_reg(__le32  *addr)
+static inline u32 qlge_read_sh_reg(__le32  *addr)
 {
 	u32 reg;
 	reg =  le32_to_cpu(*addr);
@@ -2233,132 +2233,132 @@ extern char qlge_driver_name[];
 extern const char qlge_driver_version[];
 extern const struct ethtool_ops qlge_ethtool_ops;
 
-int ql_sem_spinlock(struct ql_adapter *qdev, u32 sem_mask);
-void ql_sem_unlock(struct ql_adapter *qdev, u32 sem_mask);
-int ql_read_xgmac_reg(struct ql_adapter *qdev, u32 reg, u32 *data);
-int ql_get_mac_addr_reg(struct ql_adapter *qdev, u32 type, u16 index,
+int qlge_sem_spinlock(struct qlge_adapter *qdev, u32 sem_mask);
+void qlge_sem_unlock(struct qlge_adapter *qdev, u32 sem_mask);
+int qlge_read_xgmac_reg(struct qlge_adapter *qdev, u32 reg, u32 *data);
+int qlge_get_mac_addr_reg(struct qlge_adapter *qdev, u32 type, u16 index,
 			u32 *value);
-int ql_get_routing_reg(struct ql_adapter *qdev, u32 index, u32 *value);
-int ql_write_cfg(struct ql_adapter *qdev, void *ptr, int size, u32 bit,
+int qlge_get_routing_reg(struct qlge_adapter *qdev, u32 index, u32 *value);
+int qlge_write_cfg(struct qlge_adapter *qdev, void *ptr, int size, u32 bit,
 		 u16 q_id);
-void ql_queue_fw_error(struct ql_adapter *qdev);
-void ql_mpi_work(struct work_struct *work);
-void ql_mpi_reset_work(struct work_struct *work);
-void ql_mpi_core_to_log(struct work_struct *work);
-int ql_wait_reg_rdy(struct ql_adapter *qdev, u32 reg, u32 bit, u32 ebit);
-void ql_queue_asic_error(struct ql_adapter *qdev);
-void ql_set_ethtool_ops(struct net_device *ndev);
-int ql_read_xgmac_reg64(struct ql_adapter *qdev, u32 reg, u64 *data);
-void ql_mpi_idc_work(struct work_struct *work);
-void ql_mpi_port_cfg_work(struct work_struct *work);
-int ql_mb_get_fw_state(struct ql_adapter *qdev);
-int ql_cam_route_initialize(struct ql_adapter *qdev);
-int ql_read_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 *data);
-int ql_write_mpi_reg(struct ql_adapter *qdev, u32 reg, u32 data);
-int ql_unpause_mpi_risc(struct ql_adapter *qdev);
-int ql_pause_mpi_risc(struct ql_adapter *qdev);
-int ql_hard_reset_mpi_risc(struct ql_adapter *qdev);
-int ql_soft_reset_mpi_risc(struct ql_adapter *qdev);
-int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf, u32 ram_addr,
+void qlge_queue_fw_error(struct qlge_adapter *qdev);
+void qlge_mpi_work(struct work_struct *work);
+void qlge_mpi_reset_work(struct work_struct *work);
+void qlge_mpi_core_to_log(struct work_struct *work);
+int qlge_wait_reg_rdy(struct qlge_adapter *qdev, u32 reg, u32 bit, u32 ebit);
+void qlge_queue_asic_error(struct qlge_adapter *qdev);
+void qlge_set_ethtool_ops(struct net_device *ndev);
+int qlge_read_xgmac_reg64(struct qlge_adapter *qdev, u32 reg, u64 *data);
+void qlge_mpi_idc_work(struct work_struct *work);
+void qlge_mpi_port_cfg_work(struct work_struct *work);
+int qlge_mb_get_fw_state(struct qlge_adapter *qdev);
+int qlge_cam_route_initialize(struct qlge_adapter *qdev);
+int qlge_read_mpi_reg(struct qlge_adapter *qdev, u32 reg, u32 *data);
+int qlge_write_mpi_reg(struct qlge_adapter *qdev, u32 reg, u32 data);
+int qlge_unpause_mpi_risc(struct qlge_adapter *qdev);
+int qlge_pause_mpi_risc(struct qlge_adapter *qdev);
+int qlge_hard_reset_mpi_risc(struct qlge_adapter *qdev);
+int qlge_soft_reset_mpi_risc(struct qlge_adapter *qdev);
+int qlge_dump_risc_ram_area(struct qlge_adapter *qdev, void *buf, u32 ram_addr,
 			  int word_count);
-int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump);
-int ql_mb_about_fw(struct ql_adapter *qdev);
-int ql_mb_wol_set_magic(struct ql_adapter *qdev, u32 enable_wol);
-int ql_mb_wol_mode(struct ql_adapter *qdev, u32 wol);
-int ql_mb_set_led_cfg(struct ql_adapter *qdev, u32 led_config);
-int ql_mb_get_led_cfg(struct ql_adapter *qdev);
-void ql_link_on(struct ql_adapter *qdev);
-void ql_link_off(struct ql_adapter *qdev);
-int ql_mb_set_mgmnt_traffic_ctl(struct ql_adapter *qdev, u32 control);
-int ql_mb_get_port_cfg(struct ql_adapter *qdev);
-int ql_mb_set_port_cfg(struct ql_adapter *qdev);
-int ql_wait_fifo_empty(struct ql_adapter *qdev);
-void ql_get_dump(struct ql_adapter *qdev, void *buff);
-netdev_tx_t ql_lb_send(struct sk_buff *skb, struct net_device *ndev);
-void ql_check_lb_frame(struct ql_adapter *, struct sk_buff *);
-int ql_own_firmware(struct ql_adapter *qdev);
-int ql_clean_lb_rx_ring(struct rx_ring *rx_ring, int budget);
-
-/* #define QL_ALL_DUMP */
-/* #define QL_REG_DUMP */
-/* #define QL_DEV_DUMP */
-/* #define QL_CB_DUMP */
-/* #define QL_IB_DUMP */
-/* #define QL_OB_DUMP */
-
-#ifdef QL_REG_DUMP
-void ql_dump_xgmac_control_regs(struct ql_adapter *qdev);
-void ql_dump_routing_entries(struct ql_adapter *qdev);
-void ql_dump_regs(struct ql_adapter *qdev);
-#define QL_DUMP_REGS(qdev) ql_dump_regs(qdev)
-#define QL_DUMP_ROUTE(qdev) ql_dump_routing_entries(qdev)
-#define QL_DUMP_XGMAC_CONTROL_REGS(qdev) ql_dump_xgmac_control_regs(qdev)
+int qlge_core_dump(struct qlge_adapter *qdev, struct qlge_mpi_coredump *mpi_coredump);
+int qlge_mb_about_fw(struct qlge_adapter *qdev);
+int qlge_mb_wol_set_magic(struct qlge_adapter *qdev, u32 enable_wol);
+int qlge_mb_wol_mode(struct qlge_adapter *qdev, u32 wol);
+int qlge_mb_set_led_cfg(struct qlge_adapter *qdev, u32 led_config);
+int qlge_mb_get_led_cfg(struct qlge_adapter *qdev);
+void qlge_link_on(struct qlge_adapter *qdev);
+void qlge_link_off(struct qlge_adapter *qdev);
+int qlge_mb_set_mgmnt_traffic_ctl(struct qlge_adapter *qdev, u32 control);
+int qlge_mb_get_port_cfg(struct qlge_adapter *qdev);
+int qlge_mb_set_port_cfg(struct qlge_adapter *qdev);
+int qlge_wait_fifo_empty(struct qlge_adapter *qdev);
+void qlge_get_dump(struct qlge_adapter *qdev, void *buff);
+netdev_tx_t qlge_lb_send(struct sk_buff *skb, struct net_device *ndev);
+void qlge_check_lb_frame(struct qlge_adapter *, struct sk_buff *);
+int qlge_own_firmware(struct qlge_adapter *qdev);
+int qlge_clean_lb_rx_ring(struct qlge_rx_ring *rx_ring, int budget);
+
+/* #define QLGE_ALL_DUMP */
+/* #define QLGE_REG_DUMP */
+/* #define QLGE_DEV_DUMP */
+/* #define QLGE_CB_DUMP */
+/* #define QLGE_IB_DUMP */
+/* #define QLGE_OB_DUMP */
+
+#ifdef QLGE_REG_DUMP
+void qlge_dump_xgmac_control_regs(struct qlge_adapter *qdev);
+void qlge_dump_routing_entries(struct qlge_adapter *qdev);
+void qlge_dump_regs(struct qlge_adapter *qdev);
+#define QLGE_DUMP_REGS(qdev) qlge_dump_regs(qdev)
+#define QLGE_DUMP_ROUTE(qdev) qlge_dump_routing_entries(qdev)
+#define QLGE_DUMP_XGMAC_CONTROL_REGS(qdev) qlge_dump_xgmac_control_regs(qdev)
 #else
-#define QL_DUMP_REGS(qdev)
-#define QL_DUMP_ROUTE(qdev)
-#define QL_DUMP_XGMAC_CONTROL_REGS(qdev)
+#define QLGE_DUMP_REGS(qdev)
+#define QLGE_DUMP_ROUTE(qdev)
+#define QLGE_DUMP_XGMAC_CONTROL_REGS(qdev)
 #endif
 
-#ifdef QL_STAT_DUMP
-void ql_dump_stat(struct ql_adapter *qdev);
-#define QL_DUMP_STAT(qdev) ql_dump_stat(qdev)
+#ifdef QLGE_STAT_DUMP
+void qlge_dump_stat(struct qlge_adapter *qdev);
+#define QLGE_DUMP_STAT(qdev) qlge_dump_stat(qdev)
 #else
-#define QL_DUMP_STAT(qdev)
+#define QLGE_DUMP_STAT(qdev)
 #endif
 
-#ifdef QL_DEV_DUMP
-void ql_dump_qdev(struct ql_adapter *qdev);
-#define QL_DUMP_QDEV(qdev) ql_dump_qdev(qdev)
+#ifdef QLGE_DEV_DUMP
+void qlge_dump_qdev(struct qlge_adapter *qdev);
+#define QLGE_DUMP_QDEV(qdev) qlge_dump_qdev(qdev)
 #else
-#define QL_DUMP_QDEV(qdev)
+#define QLGE_DUMP_QDEV(qdev)
 #endif
 
-#ifdef QL_CB_DUMP
-void ql_dump_wqicb(struct wqicb *wqicb);
-void ql_dump_tx_ring(struct tx_ring *tx_ring);
-void ql_dump_ricb(struct ricb *ricb);
-void ql_dump_cqicb(struct cqicb *cqicb);
-void ql_dump_rx_ring(struct rx_ring *rx_ring);
-void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id);
-#define QL_DUMP_RICB(ricb) ql_dump_ricb(ricb)
-#define QL_DUMP_WQICB(wqicb) ql_dump_wqicb(wqicb)
-#define QL_DUMP_TX_RING(tx_ring) ql_dump_tx_ring(tx_ring)
-#define QL_DUMP_CQICB(cqicb) ql_dump_cqicb(cqicb)
-#define QL_DUMP_RX_RING(rx_ring) ql_dump_rx_ring(rx_ring)
-#define QL_DUMP_HW_CB(qdev, size, bit, q_id) \
-		ql_dump_hw_cb(qdev, size, bit, q_id)
+#ifdef QLGE_CB_DUMP
+void qlge_dump_wqicb(struct qlge_wqicb *wqicb);
+void qlge_dump_tx_ring(struct qlge_tx_ring *tx_ring);
+void qlge_dump_ricb(struct qlge_ricb *ricb);
+void qlge_dump_cqicb(struct qlge_cqicb *cqicb);
+void qlge_dump_rx_ring(struct qlge_rx_ring *rx_ring);
+void qlge_dump_hw_cb(struct qlge_adapter *qdev, int size, u32 bit, u16 q_id);
+#define QLGE_DUMP_RICB(ricb) qlge_dump_ricb(ricb)
+#define QLGE_DUMP_WQICB(wqicb) qlge_dump_wqicb(wqicb)
+#define QLGE_DUMP_TX_RING(tx_ring) qlge_dump_tx_ring(tx_ring)
+#define QLGE_DUMP_CQICB(cqicb) qlge_dump_cqicb(cqicb)
+#define QLGE_DUMP_RX_RING(rx_ring) qlge_dump_rx_ring(rx_ring)
+#define QLGE_DUMP_HW_CB(qdev, size, bit, q_id) \
+		qlge_dump_hw_cb(qdev, size, bit, q_id)
 #else
-#define QL_DUMP_RICB(ricb)
-#define QL_DUMP_WQICB(wqicb)
-#define QL_DUMP_TX_RING(tx_ring)
-#define QL_DUMP_CQICB(cqicb)
-#define QL_DUMP_RX_RING(rx_ring)
-#define QL_DUMP_HW_CB(qdev, size, bit, q_id)
+#define QLGE_DUMP_RICB(ricb)
+#define QLGE_DUMP_WQICB(wqicb)
+#define QLGE_DUMP_TX_RING(tx_ring)
+#define QLGE_DUMP_CQICB(cqicb)
+#define QLGE_DUMP_RX_RING(rx_ring)
+#define QLGE_DUMP_HW_CB(qdev, size, bit, q_id)
 #endif
 
-#ifdef QL_OB_DUMP
-void ql_dump_tx_desc(struct tx_buf_desc *tbd);
-void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb);
-void ql_dump_ob_mac_rsp(struct ob_mac_iocb_rsp *ob_mac_rsp);
-#define QL_DUMP_OB_MAC_IOCB(ob_mac_iocb) ql_dump_ob_mac_iocb(ob_mac_iocb)
-#define QL_DUMP_OB_MAC_RSP(ob_mac_rsp) ql_dump_ob_mac_rsp(ob_mac_rsp)
+#ifdef QLGE_OB_DUMP
+void qlge_dump_tx_desc(struct tx_buf_desc *tbd);
+void qlge_dump_ob_mac_iocb(struct qlge_ob_mac_iocb_req *ob_mac_iocb);
+void qlge_dump_ob_mac_rsp(struct qlge_ob_mac_iocb_rsp *ob_mac_rsp);
+#define QLGE_DUMP_OB_MAC_IOCB(ob_mac_iocb) qlge_dump_ob_mac_iocb(ob_mac_iocb)
+#define QLGE_DUMP_OB_MAC_RSP(ob_mac_rsp) qlge_dump_ob_mac_rsp(ob_mac_rsp)
 #else
-#define QL_DUMP_OB_MAC_IOCB(ob_mac_iocb)
-#define QL_DUMP_OB_MAC_RSP(ob_mac_rsp)
+#define QLGE_DUMP_OB_MAC_IOCB(ob_mac_iocb)
+#define QLGE_DUMP_OB_MAC_RSP(ob_mac_rsp)
 #endif
 
-#ifdef QL_IB_DUMP
-void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp);
-#define QL_DUMP_IB_MAC_RSP(ib_mac_rsp) ql_dump_ib_mac_rsp(ib_mac_rsp)
+#ifdef QLGE_IB_DUMP
+void qlge_dump_ib_mac_rsp(struct qlge_ib_mac_iocb_rsp *ib_mac_rsp);
+#define QLGE_DUMP_IB_MAC_RSP(ib_mac_rsp) qlge_dump_ib_mac_rsp(ib_mac_rsp)
 #else
-#define QL_DUMP_IB_MAC_RSP(ib_mac_rsp)
+#define QLGE_DUMP_IB_MAC_RSP(ib_mac_rsp)
 #endif
 
-#ifdef	QL_ALL_DUMP
-void ql_dump_all(struct ql_adapter *qdev);
-#define QL_DUMP_ALL(qdev) ql_dump_all(qdev)
+#ifdef	QLGE_ALL_DUMP
+void qlge_dump_all(struct qlge_adapter *qdev);
+#define QLGE_DUMP_ALL(qdev) qlge_dump_all(qdev)
 #else
-#define QL_DUMP_ALL(qdev)
+#define QLGE_DUMP_ALL(qdev)
 #endif
 
 #endif /* _QLGE_H_ */
drivers/staging/qlge/qlge_dbg.c +319 -319

1,629 lines not on this page · raw message

drivers/staging/qlge/qlge_ethtool.c +242 -242

394 lines not on this page · raw message

drivers/staging/qlge/qlge_main.c +600 -600

1,200 lines not on this page · raw message

drivers/staging/qlge/qlge_mpi.c +193 -193

386 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 3 lines · Sidong Yang

In terms of namespace, The driver uses either qlge_, ql_ or nothing. also there is macro using QL_. This can make crash with other qlogic drivers. Rename everything to use the qlge_ or QLGE_ prefix.

How can it crash anything?

I can see changing global functions to a common namespace like this, but you are changing a _lot_ of things here:

Quoted 22 lines
---
 drivers/staging/qlge/qlge.h         |  488 +++++------
 drivers/staging/qlge/qlge_dbg.c     |  638 +++++++-------
 drivers/staging/qlge/qlge_ethtool.c |  484 +++++------
 drivers/staging/qlge/qlge_main.c    | 1200 +++++++++++++--------------
 drivers/staging/qlge/qlge_mpi.c     |  386 ++++-----
 5 files changed, 1598 insertions(+), 1598 deletions(-)
drivers/staging/qlge/qlge.h +1 -1
index fc8c5ca8935d..a8da06c978ff 100644
@@ -955,7 +955,7 @@ enum {
 	MB_CMD_GET_PORT_CFG = 0x00000123,
 	MB_CMD_GET_LINK_STS = 0x00000124,
 	MB_CMD_SET_LED_CFG = 0x00000125, /* Set LED Configuration Register */
-		QL_LED_BLINK = 0x03e803e8,
+		QLGE_LED_BLINK = 0x03e803e8,
 	MB_CMD_GET_LED_CFG = 0x00000126, /* Get LED Configuration Register */
 	MB_CMD_SET_MGMNT_TFK_CTL = 0x00000160, /* Set Mgmnt Traffic Control */
 	MB_SET_MPI_TFK_STOP = (1 << 0),

drivers/staging/qlge/qlge.h enum { · line 994

Quoted 10 lines
drivers/staging/qlge/qlge.h +1 -1
@@ -986,14 +986,14 @@ enum {
 	MB_CMD_STS_PARAM_ERR = 0x00004006,	/* Parameter Error. */
 };
 
-struct mbox_params {
+struct qlge_mbox_params {
 	u32 mbox_in[MAILBOX_COUNT];
 	u32 mbox_out[MAILBOX_COUNT];
 	int in_count;
 	int out_count;
 };

Why change local structure names that are local to the specific driver? That "namespace" can not escape out of the driver, so lots of these changes are unneeded.

I will gladly take a patch that fixes up the global symbols, but that's all that needs to be done here, right?

thanks,

greg k-h