diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2010-09-07 21:34:29 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-08 21:46:26 (GMT) |
commit | 933d41f1f2b6d5e7bcc0782ad0eeaac983a79592 (patch) | |
tree | f0806ddab3caed3540877d969cabfa691220ff90 /drivers/net | |
parent | a1c3ed4c9ca01dded8d511a1d1daf271fbae8d89 (diff) | |
download | linux-933d41f1f2b6d5e7bcc0782ad0eeaac983a79592.tar.xz |
ixgbe: fix TX ring enable issues seen when VMDQ is enabled
The ordering of operations was messed up in the init and as a result when
VMDQ was enabled we were trying to enable TX rings before setting the VFTE
bits. This resulted in a ring that appeared to fail to enable when in fact
it was blocked because the VFTE bits were cleared after the reset.
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 3aafe94..0027d75 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -3004,7 +3004,6 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) /* Program registers for the distribution of queues */ ixgbe_setup_mrqc(adapter); - ixgbe_configure_virtualization(adapter); ixgbe_set_uta(adapter); @@ -3391,6 +3390,7 @@ static void ixgbe_configure(struct ixgbe_adapter *adapter) } else if (adapter->flags & IXGBE_FLAG_FDIR_PERFECT_CAPABLE) { ixgbe_init_fdir_perfect_82599(hw, adapter->fdir_pballoc); } + ixgbe_configure_virtualization(adapter); ixgbe_configure_tx(adapter); ixgbe_configure_rx(adapter); |