diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-10 22:55:03 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-10 22:55:03 -0800 |
| commit | d4a66e752d0b19934dd208884f8605fe385aaaa9 (patch) | |
| tree | 72fb727be1d7636aae9cddfe9aa93ac9dec75daf /drivers/net/benet/be_cmds.h | |
| parent | bdbec4b86ee99b020e159f9bd604003a3ae3b0ab (diff) | |
| parent | fa15e99b6bb44aa86b241a43ca8c509e91f80153 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_cmds.h
include/linux/sysctl.h
Diffstat (limited to 'drivers/net/benet/be_cmds.h')
| -rw-r--r-- | drivers/net/benet/be_cmds.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h index 6eed512bb6d..cb3188f8708 100644 --- a/drivers/net/benet/be_cmds.h +++ b/drivers/net/benet/be_cmds.h @@ -156,6 +156,7 @@ struct be_mcc_mailbox { #define OPCODE_LOWLEVEL_HOST_DDR_DMA 17 #define OPCODE_LOWLEVEL_LOOPBACK_TEST 18 +#define OPCODE_LOWLEVEL_SET_LOOPBACK_MODE 19 struct be_cmd_req_hdr { u8 opcode; /* dword 0 */ @@ -822,6 +823,19 @@ struct be_cmd_resp_loopback_test { u32 ticks_compl; }; +struct be_cmd_req_set_lmode { + struct be_cmd_req_hdr hdr; + u8 src_port; + u8 dest_port; + u8 loopback_type; + u8 loopback_state; +}; + +struct be_cmd_resp_set_lmode { + struct be_cmd_resp_hdr resp_hdr; + u8 rsvd0[4]; +}; + /********************** DDR DMA test *********************/ struct be_cmd_req_ddrdma_test { struct be_cmd_req_hdr hdr; @@ -928,3 +942,6 @@ extern int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern, u32 byte_cnt, struct be_dma_mem *cmd); extern int be_cmd_get_seeprom_data(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd); +extern int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num, + u8 loopback_type, u8 enable); + |