igbvf: Allow VF driver to correctly recognize failure to set mac
authorAlexander Duyck <alexander.h.duyck@intel.com>
Tue, 4 Aug 2009 18:46:41 +0000 (11:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Aug 2009 18:46:41 +0000 (11:46 -0700)
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: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/igbvf/vf.c

index 2a4faf9ade69d7893a73d67e57411f1bab85eb24..a9a61efa964cf7b7cc32b439952ed2a444fa1ebe 100644 (file)
@@ -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)))