Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[mv-sheeva.git] / drivers / net / benet / be_cmds.h

diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index c7f6cdfe1c73df85bc4faf251e05b19dd6602791..83d15c8a9fa30e1bf5e28a371c7cf7fade8e0580 100644 (file)
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -309,7 +309,7 @@ struct be_cmd_req_pmac_del {
 /******************** Create CQ ***************************/
 /* Pseudo amap definition in which each bit of the actual structure is defined
  * as a byte: used to calculate offset/shift/mask of each field */
-struct amap_cq_context {
+struct amap_cq_context_be {
        u8 cidx[11];            /* dword 0*/
        u8 rsvd0;               /* dword 0*/
        u8 coalescwm[2];        /* dword 0*/
@@ -332,14 +332,32 @@ struct amap_cq_context {
        u8 rsvd5[32];           /* dword 3*/
 } __packed;
 
+struct amap_cq_context_lancer {
+       u8 rsvd0[12];           /* dword 0*/
+       u8 coalescwm[2];        /* dword 0*/
+       u8 nodelay;             /* dword 0*/
+       u8 rsvd1[12];           /* dword 0*/
+       u8 count[2];            /* dword 0*/
+       u8 valid;               /* dword 0*/
+       u8 rsvd2;               /* dword 0*/
+       u8 eventable;           /* dword 0*/
+       u8 eqid[16];            /* dword 1*/
+       u8 rsvd3[15];           /* dword 1*/
+       u8 armed;               /* dword 1*/
+       u8 rsvd4[32];           /* dword 2*/
+       u8 rsvd5[32];           /* dword 3*/
+} __packed;
+
 struct be_cmd_req_cq_create {
        struct be_cmd_req_hdr hdr;
        u16 num_pages;
-       u16 rsvd0;
-       u8 context[sizeof(struct amap_cq_context) / 8];
+       u8 page_size;
+       u8 rsvd0;
+       u8 context[sizeof(struct amap_cq_context_be) / 8];
        struct phys_addr pages[8];
 } __packed;
 
+
 struct be_cmd_resp_cq_create {
        struct be_cmd_resp_hdr hdr;
        u16 cq_id;
@@ -349,7 +367,7 @@ struct be_cmd_resp_cq_create {
 /******************** Create MCCQ ***************************/
 /* Pseudo amap definition in which each bit of the actual structure is defined
  * as a byte: used to calculate offset/shift/mask of each field */
-struct amap_mcc_context {
+struct amap_mcc_context_be {
        u8 con_index[14];
        u8 rsvd0[2];
        u8 ring_size[4];
@@ -364,12 +382,23 @@ struct amap_mcc_context {
        u8 rsvd2[32];
 } __packed;
 
+struct amap_mcc_context_lancer {
+       u8 async_cq_id[16];
+       u8 ring_size[4];
+       u8 rsvd0[12];
+       u8 rsvd1[31];
+       u8 valid;
+       u8 async_cq_valid[1];
+       u8 rsvd2[31];
+       u8 rsvd3[32];
+} __packed;
+
 struct be_cmd_req_mcc_create {
        struct be_cmd_req_hdr hdr;
        u16 num_pages;
-       u16 rsvd0;
+       u16 cq_id;
        u32 async_event_bitmap[1];
-       u8 context[sizeof(struct amap_mcc_context) / 8];
+       u8 context[sizeof(struct amap_mcc_context_be) / 8];
        struct phys_addr pages[8];
 } __packed;
 
@@ -605,6 +634,7 @@ struct be_hw_stats {
        struct be_rxf_stats rxf;
        u32 rsvd[48];
        struct be_erx_stats erx;
+       u32 rsvd1[6];
 };
 
 struct be_cmd_req_get_stats {
@@ -1022,8 +1052,6 @@ extern int be_cmd_set_beacon_state(struct be_adapter *adapter,
                        u8 port_num, u8 beacon, u8 status, u8 state);
 extern int be_cmd_get_beacon_state(struct be_adapter *adapter,
                        u8 port_num, u32 *state);
-extern int be_cmd_read_port_type(struct be_adapter *adapter, u32 port,
-                                       u8 *connector);
 extern int be_cmd_write_flashrom(struct be_adapter *adapter,
                        struct be_dma_mem *cmd, u32 flash_oper,
                        u32 flash_opcode, u32 buf_size);