diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-14 14:35:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-14 14:35:11 -0400 |
| commit | a8aa39530269371c786391f3417d8cff07656676 (patch) | |
| tree | a83c6221387e40da3b2b725a0ec34ef088abffde | |
| parent | 37c343b4f4e70e9dc328ab04903c0ec8d154c1a4 (diff) | |
| parent | e9093b1183bbac462d2caef3eac165778c0b1bf1 (diff) | |
Merge branch 'mlxsw-small-fixes'
Jiri Pirko says:
====================
mlxsw: Couple of fixes
Couple or small fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/reg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h index 0899e2d310e2..d9616daf8a70 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h | |||
| @@ -769,7 +769,7 @@ static inline void mlxsw_reg_spvid_pack(char *payload, u8 local_port, u16 pvid) | |||
| 769 | #define MLXSW_REG_SPVM_ID 0x200F | 769 | #define MLXSW_REG_SPVM_ID 0x200F |
| 770 | #define MLXSW_REG_SPVM_BASE_LEN 0x04 /* base length, without records */ | 770 | #define MLXSW_REG_SPVM_BASE_LEN 0x04 /* base length, without records */ |
| 771 | #define MLXSW_REG_SPVM_REC_LEN 0x04 /* record length */ | 771 | #define MLXSW_REG_SPVM_REC_LEN 0x04 /* record length */ |
| 772 | #define MLXSW_REG_SPVM_REC_MAX_COUNT 256 | 772 | #define MLXSW_REG_SPVM_REC_MAX_COUNT 255 |
| 773 | #define MLXSW_REG_SPVM_LEN (MLXSW_REG_SPVM_BASE_LEN + \ | 773 | #define MLXSW_REG_SPVM_LEN (MLXSW_REG_SPVM_BASE_LEN + \ |
| 774 | MLXSW_REG_SPVM_REC_LEN * MLXSW_REG_SPVM_REC_MAX_COUNT) | 774 | MLXSW_REG_SPVM_REC_LEN * MLXSW_REG_SPVM_REC_MAX_COUNT) |
| 775 | 775 | ||
| @@ -1702,7 +1702,7 @@ static inline void mlxsw_reg_sfmr_pack(char *payload, | |||
| 1702 | #define MLXSW_REG_SPVMLR_ID 0x2020 | 1702 | #define MLXSW_REG_SPVMLR_ID 0x2020 |
| 1703 | #define MLXSW_REG_SPVMLR_BASE_LEN 0x04 /* base length, without records */ | 1703 | #define MLXSW_REG_SPVMLR_BASE_LEN 0x04 /* base length, without records */ |
| 1704 | #define MLXSW_REG_SPVMLR_REC_LEN 0x04 /* record length */ | 1704 | #define MLXSW_REG_SPVMLR_REC_LEN 0x04 /* record length */ |
| 1705 | #define MLXSW_REG_SPVMLR_REC_MAX_COUNT 256 | 1705 | #define MLXSW_REG_SPVMLR_REC_MAX_COUNT 255 |
| 1706 | #define MLXSW_REG_SPVMLR_LEN (MLXSW_REG_SPVMLR_BASE_LEN + \ | 1706 | #define MLXSW_REG_SPVMLR_LEN (MLXSW_REG_SPVMLR_BASE_LEN + \ |
| 1707 | MLXSW_REG_SPVMLR_REC_LEN * \ | 1707 | MLXSW_REG_SPVMLR_REC_LEN * \ |
| 1708 | MLXSW_REG_SPVMLR_REC_MAX_COUNT) | 1708 | MLXSW_REG_SPVMLR_REC_MAX_COUNT) |