summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/chelsio/cxgb4
diff options
context:
space:
mode:
authorSurendra Mobiya2017-05-30 08:02:06 +0200
committerDavid S. Miller2017-05-30 20:10:11 +0200
commitb1a73af910e4e77c2eef9953f673d4c74ba07ad7 (patch)
tree72a2eb6556620a165a6265f61a0e682f90a59994 /drivers/net/ethernet/chelsio/cxgb4
parentMerge branch 'net-qualcomm-add-QCA7000-UART-driver' (diff)
downloadkernel-qcow2-linux-b1a73af910e4e77c2eef9953f673d4c74ba07ad7.tar.gz
kernel-qcow2-linux-b1a73af910e4e77c2eef9953f673d4c74ba07ad7.tar.xz
kernel-qcow2-linux-b1a73af910e4e77c2eef9953f673d4c74ba07ad7.zip
cxgb4: keep carrier off before registering netdev
Mark carrier off before registering netdev to ensure that vlan device picks up the correct state of the carrier Signed-off-by: Surendra Mobiya <surendra@chelsio.com> Signed-off-by: Ganesh Goudar <ganeshgr@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4')
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 2ae54d54aea8..06c3414c93b1 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -4956,6 +4956,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
netif_set_real_num_tx_queues(adapter->port[i], pi->nqsets);
netif_set_real_num_rx_queues(adapter->port[i], pi->nqsets);
+ netif_carrier_off(adapter->port[i]);
+
err = register_netdev(adapter->port[i]);
if (err)
break;