diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-16 22:07:36 +0100 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-16 22:07:36 +0100 |
commit | 813ae37e6aed72cc457094b6066aa38efd66c9e9 (patch) | |
tree | 8eb38e60d52feb2bb0cd022a434e80de53914719 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |
parent | 6314a17fec5cab4784a5cbb75e816b15e3d22e3e (diff) | |
parent | 47bdf3378d62a627cfb8a54e1180c08d67078b61 (diff) | |
download | op-kernel-dev-813ae37e6aed72cc457094b6066aa38efd66c9e9.zip op-kernel-dev-813ae37e6aed72cc457094b6066aa38efd66c9e9.tar.gz |
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into kvm/next
Topic branch for AVX512_4VNNIW and AVX512_4FMAPS support in KVM.
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index a244d9a..bd93d82 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -9135,10 +9135,14 @@ static void *ixgbe_fwd_add(struct net_device *pdev, struct net_device *vdev) goto fwd_add_err; fwd_adapter->pool = pool; fwd_adapter->real_adapter = adapter; - err = ixgbe_fwd_ring_up(vdev, fwd_adapter); - if (err) - goto fwd_add_err; - netif_tx_start_all_queues(vdev); + + if (netif_running(pdev)) { + err = ixgbe_fwd_ring_up(vdev, fwd_adapter); + if (err) + goto fwd_add_err; + netif_tx_start_all_queues(vdev); + } + return fwd_adapter; fwd_add_err: /* unwind counter and free adapter struct */ |