mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
Merge branch 'mlxsw-fixes'
Jiri Pirko says: ==================== mlxsw: couple of fixes Just a couple of small fixes. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
5edc11ab87
2 changed files with 4 additions and 2 deletions
|
@ -187,6 +187,7 @@ __mlxsw_item_bit_array_offset(struct mlxsw_item *item, u16 index, u8 *shift)
|
|||
{
|
||||
u16 max_index, be_index;
|
||||
u16 offset; /* byte offset inside the array */
|
||||
u8 in_byte_index;
|
||||
|
||||
BUG_ON(index && !item->element_size);
|
||||
if (item->offset % sizeof(u32) != 0 ||
|
||||
|
@ -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;
|
||||
be_index = max_index - index;
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -1069,9 +1069,9 @@ static int mlxsw_sx_port_create(struct mlxsw_sx *mlxsw_sx, u8 local_port)
|
|||
return 0;
|
||||
|
||||
err_register_netdev:
|
||||
err_port_admin_status_set:
|
||||
err_port_mac_learning_mode_set:
|
||||
err_port_stp_state_set:
|
||||
err_port_admin_status_set:
|
||||
err_port_mtu_set:
|
||||
err_port_speed_set:
|
||||
err_port_swid_set:
|
||||
|
|
Loading…
Reference in a new issue