1 files changed, 17 insertions, 40 deletions

diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index ba2e1c5b6bcf..459663a4023d 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -818,15 +818,6 @@ struct tx_doorbell_context {
 };
 
 /* DATA STRUCTURES SHARED WITH HARDWARE. */
-
-struct bq_element {
-        u32 addr_lo;
-#define BQ_END  0x00000001
-#define BQ_CONT 0x00000002
-#define BQ_MASK 0x00000003
-        u32 addr_hi;
-} __attribute((packed));
-
 struct tx_buf_desc {
         __le64 addr;
         __le32 len;
@@ -860,8 +851,8 @@ struct ob_mac_iocb_req {
         __le16 frame_len;
 #define OB_MAC_IOCB_LEN_MASK 0x3ffff
         __le16 reserved2;
-        __le32 tid;
-        __le32 txq_idx;
+        u32 tid;
+        u32 txq_idx;
         __le32 reserved3;
         __le16 vlan_tci;
         __le16 reserved4;
@@ -880,8 +871,8 @@ struct ob_mac_iocb_rsp {
         u8 flags2;              /* */
         u8 flags3;              /* */
 #define OB_MAC_IOCB_RSP_B       0x80    /* */
-        __le32 tid;
-        __le32 txq_idx;
+        u32 tid;
+        u32 txq_idx;
         __le32 reserved[13];
 } __attribute((packed));
 
@@ -903,8 +894,8 @@ struct ob_mac_tso_iocb_req {
 #define OB_MAC_TSO_IOCB_V       0x04
         __le32 reserved1[2];
         __le32 frame_len;
-        __le32 tid;
-        __le32 txq_idx;
+        u32 tid;
+        u32 txq_idx;
         __le16 total_hdrs_len;
         __le16 net_trans_offset;
 #define OB_MAC_TRANSPORT_HDR_SHIFT 6
@@ -925,8 +916,8 @@ struct ob_mac_tso_iocb_rsp {
         u8 flags2;              /* */
         u8 flags3;              /* */
 #define OB_MAC_TSO_IOCB_RSP_B   0x8000
-        __le32 tid;
-        __le32 txq_idx;
+        u32 tid;
+        u32 txq_idx;
         __le32 reserved2[13];
 } __attribute((packed));
 
@@ -979,10 +970,11 @@ struct ib_mac_iocb_rsp {
 
         __le16 reserved1;
         __le32 reserved2[6];
-        __le32 flags4;
-#define IB_MAC_IOCB_RSP_HV      0x20000000      /* */
-#define IB_MAC_IOCB_RSP_HS      0x40000000      /* */
-#define IB_MAC_IOCB_RSP_HL      0x80000000      /* */
+        u8 reserved3[3];
+        u8 flags4;
+#define IB_MAC_IOCB_RSP_HV      0x20
+#define IB_MAC_IOCB_RSP_HS      0x40
+#define IB_MAC_IOCB_RSP_HL      0x80
         __le32 hdr_len;         /* */
         __le32 hdr_addr_lo;     /* */
         __le32 hdr_addr_hi;     /* */
@@ -1126,7 +1118,7 @@ struct map_list {
 struct tx_ring_desc {
         struct sk_buff *skb;
         struct ob_mac_iocb_req *queue_entry;
-        int index;
+        u32 index;
         struct oal oal;
         struct map_list map[MAX_SKB_FRAGS + 1];
         int map_cnt;
@@ -1138,8 +1130,8 @@ struct bq_desc {
                 struct page *lbq_page;
                 struct sk_buff *skb;
         } p;
-        struct bq_element *bq;
-        int index;
+        __le64 *addr;
+        u32 index;
          DECLARE_PCI_UNMAP_ADDR(mapaddr);
          DECLARE_PCI_UNMAP_LEN(maplen);
 };
@@ -1189,7 +1181,7 @@ struct rx_ring {
         u32 cq_size;
         u32 cq_len;
         u16 cq_id;
-        u32 *prod_idx_sh_reg;   /* Shadowed producer register. */
+        volatile __le32 *prod_idx_sh_reg;       /* Shadowed producer register. */
         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 */
@@ -1467,21 +1459,6 @@ static inline void ql_write_db_reg(u32 val, void __iomem *addr)
         mmiowb();
 }
 
-/*
- * Shadow Registers:
- * Outbound queues have a consumer index that is maintained by the chip.
- * Inbound queues have a producer index that is maintained by the chip.
- * For lower overhead, these registers are "shadowed" to host memory
- * which allows the device driver to track the queue progress without
- * PCI reads. When an entry is placed on an inbound queue, the chip will
- * update the relevant index register and then copy the value to the
- * shadow register in host memory.
- */
-static inline unsigned int ql_read_sh_reg(const volatile void  *addr)
-{
-        return *(volatile unsigned int __force *)addr;
-}
-
 extern char qlge_driver_name[];
 extern const char qlge_driver_version[];
 extern const struct ethtool_ops qlge_ethtool_ops;