diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-04-03 16:27:15 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-04-14 18:56:47 -0400 |
commit | b32d15b9d71b37854b94923a176acda35b40c9f4 (patch) | |
tree | 16732ded60dcd7c51c7dfabb17cc942f2f4e5b1e /drivers/net/ethernet/intel | |
parent | da61b36706f06a95bedeef0168db5b40a2940f8a (diff) |
fm10k: corrected VF multicast update
VFs were being improperly added to the switch's multicast group. The
error stems from the fact that incorrect arguments were passed to the
"update_mc_addr" function. It would seem to be a copy paste error since
the parameters are similar to the "update_uc_addr" function.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Ngai-Mint Kwan <ngai-mint.kwan@intel.com>
Acked-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r-- | drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c index a92b58dd1c78..891e21874b2a 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c | |||
@@ -329,6 +329,9 @@ static s32 fm10k_update_xc_addr_pf(struct fm10k_hw *hw, u16 glort, | |||
329 | struct fm10k_mac_update mac_update; | 329 | struct fm10k_mac_update mac_update; |
330 | u32 msg[5]; | 330 | u32 msg[5]; |
331 | 331 | ||
332 | /* clear set bit from VLAN ID */ | ||
333 | vid &= ~FM10K_VLAN_CLEAR; | ||
334 | |||
332 | /* if glort or vlan are not valid return error */ | 335 | /* if glort or vlan are not valid return error */ |
333 | if (!fm10k_glort_valid_pf(hw, glort) || vid >= FM10K_VLAN_TABLE_VID_MAX) | 336 | if (!fm10k_glort_valid_pf(hw, glort) || vid >= FM10K_VLAN_TABLE_VID_MAX) |
334 | return FM10K_ERR_PARAM; | 337 | return FM10K_ERR_PARAM; |
@@ -1250,8 +1253,8 @@ s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results, | |||
1250 | } | 1253 | } |
1251 | 1254 | ||
1252 | /* notify switch of request for new multicast address */ | 1255 | /* notify switch of request for new multicast address */ |
1253 | err = hw->mac.ops.update_mc_addr(hw, vf_info->glort, mac, | 1256 | err = hw->mac.ops.update_mc_addr(hw, vf_info->glort, mac, vlan, |
1254 | !(vlan & FM10K_VLAN_CLEAR), 0); | 1257 | !(vlan & FM10K_VLAN_CLEAR)); |
1255 | } | 1258 | } |
1256 | 1259 | ||
1257 | return err; | 1260 | return err; |