ixgbevf: fix NACK check in ixgbevf_set_uc_addr_vf()
Subsystems (2)
PATCH 1/1 ixgbevf: fix NACK check in ixgbevf_set_uc_addr_vf()
Fix the NACK check in ixgbevf_set_uc_addr_vf() for instances where index != 0.
Signed-off-by Emil Tantilov <[email protected]>
--- drivers/net/ethernet/intel/ixgbevf/vf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/ixgbevf/vf.c +8 -6
@@ -256,7 +256,7 @@ static s32 ixgbevf_get_mac_addr_vf(struct ixgbe_hw *hw, u8 *mac_addr)static s32 ixgbevf_set_uc_addr_vf (struct ixgbe_hw *hw,u32 index,u8 *addr) {struct ixgbe_mbx_info *mbx = &hw->mbx; -u32 msgbuf[3 ]; +u32 msgbuf[3 ], msgbuf_chk;u8 *msg_addr = (u8 *)(&msgbuf[1 ]);s32 ret_val;
@@ -268,6 +268,8 @@ static s32 ixgbevf_set_uc_addr_vf(struct ixgbe_hw *hw, u32 index, u8 *addr)*/ msgbuf[0 ] |= index <<IXGBE_VT_MSGINFO_SHIFT ; msgbuf[0 ] |=IXGBE_VF_SET_MACVLAN ; + msgbuf_chk = msgbuf[0 ]; +if (addr)ether_addr_copy (msg_addr, addr); ret_val = mbx->ops.write_posted (hw, msgbuf,3 );
@@ -275,12 +277,12 @@ static s32 ixgbevf_set_uc_addr_vf(struct ixgbe_hw *hw, u32 index, u8 *addr)if (!ret_val) ret_val = mbx->ops.read_posted (hw, msgbuf,3 ); - msgbuf[0 ] &= ~IXGBE_VT_MSGTYPE_CTS ; +if (!ret_val) { + msgbuf[0 ] &= ~IXGBE_VT_MSGTYPE_CTS ; -if (!ret_val) -if (msgbuf[0 ] == - (IXGBE_VF_SET_MACVLAN |IXGBE_VT_MSGTYPE_NACK )) - ret_val = -ENOMEM ; +if (msgbuf[0 ] == (msgbuf_chk |IXGBE_VT_MSGTYPE_NACK )) +return -ENOMEM ; + }return ret_val; }
Bowers
PATCH 1/1 ixgbevf: fix NACK check in ixgbevf_set_uc_addr_vf()
Quoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Thursday, June 09, 2016 10:46 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH] ixgbevf: fix NACK check inixgbevf_set_uc_addr_vf()
Quoted 7 lines
Fix the NACK check in
ixgbevf_set_uc_addr_vf()for instances where index != 0.Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbevf/vf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
Tested-by Andrew Bowers <[email protected]>
Driver builds, compiles, and passes traffic