diff options
| author | David S. Miller | 2019-05-08 02:22:09 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-05-08 02:22:09 +0200 |
| commit | a9e41a529681b38087c91ebc0bb91e12f510ca2d (patch) | |
| tree | 544bf5861113e2f7e676a333a1267d887c800870 /drivers/net/ethernet/cadence/macb_main.c | |
| parent | net: phy: improve pause mode reporting in phy_print_status (diff) | |
| parent | cxgb4: Fix error path in cxgb4_init_module (diff) | |
| download | kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.tar.gz kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.tar.xz kernel-qcow2-linux-a9e41a529681b38087c91ebc0bb91e12f510ca2d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict with the DSA legacy code removal.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb_main.c')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 5d5c9d70b2be..c049410bc888 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2427,12 +2427,12 @@ static int macb_open(struct net_device *dev) goto pm_exit; } - bp->macbgem_ops.mog_init_rings(bp); - macb_init_hw(bp); - for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) napi_enable(&queue->napi); + bp->macbgem_ops.mog_init_rings(bp); + macb_init_hw(bp); + /* schedule a link state check */ phy_start(dev->phydev); |