From 6bebdb14d1bc802ef16ea92299a51bcf53b081f3 Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Wed, 24 Mar 2010 09:36:27 +0000 Subject: [PATCH] --- yaml --- r: 189159 b: refs/heads/master c: 581d1aa777580c1c22169538ffb46676b13c408e h: refs/heads/master i: 189157: 52375ffdcd0964f115ab717876d7f28163371404 189155: b4c4182dad9c864cf31937a6950fc62149981f30 189151: f0369dee00e801de5fc6c0606f67ef6bd68c78ea v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2bc7943bc283..eb595753c786 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5809a1ae77721931ca7bd7aeacb37fdabe6f07c0 +refs/heads/master: 581d1aa777580c1c22169538ffb46676b13c408e diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index d2cda9e5963f..1066d53e102c 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -3244,13 +3244,15 @@ void ixgbe_down(struct ixgbe_adapter *adapter) /* disable receive for all VFs and wait one second */ if (adapter->num_vfs) { - for (i = 0 ; i < adapter->num_vfs; i++) - adapter->vfinfo[i].clear_to_send = 0; - /* ping all the active vfs to let them know we are going down */ ixgbe_ping_all_vfs(adapter); + /* Disable all VFTE/VFRE TX/RX */ ixgbe_disable_tx_rx(adapter); + + /* Mark all the VFs as inactive */ + for (i = 0 ; i < adapter->num_vfs; i++) + adapter->vfinfo[i].clear_to_send = 0; } /* disable receives */