Commit 5edc11ab authored by David S. Miller's avatar David S. Miller

Merge branch 'mlxsw-fixes'

Jiri Pirko says:

====================
mlxsw: couple of fixes

Just a couple of small fixes.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6ac644a8 bee1f753
...@@ -187,6 +187,7 @@ __mlxsw_item_bit_array_offset(struct mlxsw_item *item, u16 index, u8 *shift) ...@@ -187,6 +187,7 @@ __mlxsw_item_bit_array_offset(struct mlxsw_item *item, u16 index, u8 *shift)
{ {
u16 max_index, be_index; u16 max_index, be_index;
u16 offset; /* byte offset inside the array */ u16 offset; /* byte offset inside the array */
u8 in_byte_index;
BUG_ON(index && !item->element_size); BUG_ON(index && !item->element_size);
if (item->offset % sizeof(u32) != 0 || if (item->offset % sizeof(u32) != 0 ||
...@@ -199,7 +200,8 @@ __mlxsw_item_bit_array_offset(struct mlxsw_item *item, u16 index, u8 *shift) ...@@ -199,7 +200,8 @@ __mlxsw_item_bit_array_offset(struct mlxsw_item *item, u16 index, u8 *shift)
max_index = (item->size.bytes << 3) / item->element_size - 1; max_index = (item->size.bytes << 3) / item->element_size - 1;
be_index = max_index - index; be_index = max_index - index;
offset = be_index * item->element_size >> 3; offset = be_index * item->element_size >> 3;
*shift = index % (BITS_PER_BYTE / item->element_size) << 1; in_byte_index = index % (BITS_PER_BYTE / item->element_size);
*shift = in_byte_index * item->element_size;
return item->offset + offset; return item->offset + offset;
} }
......
...@@ -1069,9 +1069,9 @@ static int mlxsw_sx_port_create(struct mlxsw_sx *mlxsw_sx, u8 local_port) ...@@ -1069,9 +1069,9 @@ static int mlxsw_sx_port_create(struct mlxsw_sx *mlxsw_sx, u8 local_port)
return 0; return 0;
err_register_netdev: err_register_netdev:
err_port_admin_status_set:
err_port_mac_learning_mode_set: err_port_mac_learning_mode_set:
err_port_stp_state_set: err_port_stp_state_set:
err_port_admin_status_set:
err_port_mtu_set: err_port_mtu_set:
err_port_speed_set: err_port_speed_set:
err_port_swid_set: err_port_swid_set:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment