Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 158746
b: refs/heads/master
c: 3255da4
h: refs/heads/master
v: v3
  • Loading branch information
Sreenivasa Honnur authored and David S. Miller committed Jul 6, 2009
1 parent e4adf75 commit 6e7ef5e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bd9ee6808b6c9106fd8046693c544d081746184b
refs/heads/master: 3255da416de6da8b3bac6d30b8eed61b54953480
9 changes: 6 additions & 3 deletions trunk/drivers/net/vxge/vxge-reg.h
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,7 @@ struct vxge_hw_mrpcim_reg {
#define VXGE_HW_XMAC_GEN_ERR_REG_XMACJ_XMAC_FSM_ERR vxge_mBIT(63)
/*0x01e18*/ u64 xmac_gen_err_mask;
/*0x01e20*/ u64 xmac_gen_err_alarm;
/*0x01e28*/ u64 xmac_link_err_port_reg[2];
/*0x01e28*/ u64 xmac_link_err_port0_reg;
#define VXGE_HW_XMAC_LINK_ERR_PORT_REG_XMACJ_PORT_DOWN vxge_mBIT(3)
#define VXGE_HW_XMAC_LINK_ERR_PORT_REG_XMACJ_PORT_UP vxge_mBIT(7)
#define VXGE_HW_XMAC_LINK_ERR_PORT_REG_XMACJ_PORT_WENT_DOWN vxge_mBIT(11)
Expand All @@ -1798,8 +1798,11 @@ struct vxge_hw_mrpcim_reg {
#define VXGE_HW_XMAC_LINK_ERR_PORT_REG_RATEMGMT_LASI_INV vxge_mBIT(39)
#define VXGE_HW_XMAC_LINK_ERR_PORT_REG_XMDIO_MDIO_MGR_ACCESS_COMPLETE \
vxge_mBIT(47)
/*0x01e30*/ u64 xmac_link_err_port_mask[2];
/*0x01e38*/ u64 xmac_link_err_port_alarm[2];
/*0x01e30*/ u64 xmac_link_err_port0_mask;
/*0x01e38*/ u64 xmac_link_err_port0_alarm;
/*0x01e40*/ u64 xmac_link_err_port1_reg;
/*0x01e48*/ u64 xmac_link_err_port1_mask;
/*0x01e50*/ u64 xmac_link_err_port1_alarm;
/*0x01e58*/ u64 xgxs_gen_err_reg;
#define VXGE_HW_XGXS_GEN_ERR_REG_XGXS_XGXS_FSM_ERR vxge_mBIT(63)
/*0x01e60*/ u64 xgxs_gen_err_mask;
Expand Down

0 comments on commit 6e7ef5e

Please sign in to comment.