Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0cff5ed authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igbvf: Allow VF driver to correctly recognize failure to set mac 



The VF driver was not correctly recognizing that it did not correctly set
it's mac address.  As a result the VF driver was unable to receive network
traffic until being unloaded and reloaded.  The issue was root caused to
the fact that the CTS bit was not taken into account when checking for the
request being NAKed.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cb13536

drivers/net/igbvf/vf.c

+4 −0
Original line number Diff line number Diff line
@@ -274,6 +274,8 @@ static s32 e1000_set_vfta_vf(struct e1000_hw *hw, u16 vid, bool set) 


	err = mbx->ops.read_posted(hw, msgbuf, 2);



	msgbuf[0] &= ~E1000_VT_MSGTYPE_CTS;



	/* if nacked the vlan was rejected */

	if (!err && (msgbuf[0] == (E1000_VF_SET_VLAN | E1000_VT_MSGTYPE_NACK)))

		err = -E1000_ERR_MAC_INIT;
@@ -317,6 +319,8 @@ static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index) 
	if (!ret_val)

		ret_val = mbx->ops.read_posted(hw, msgbuf, 3);



	msgbuf[0] &= ~E1000_VT_MSGTYPE_CTS;



	/* if nacked the address was rejected, use "perm_addr" */

	if (!ret_val &&

	    (msgbuf[0] == (E1000_VF_SET_MAC_ADDR | E1000_VT_MSGTYPE_NACK)))