diff options
| author | Dimitris Michailidis <dm@chelsio.com> | 2011-01-19 15:29:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-20 16:45:55 -0800 |
| commit | 6a3c869a6021f4abcd69aa5fbb15c63f69eb36fe (patch) | |
| tree | d130f31ff0f3943ab19c42762263a2fce9801f7c /drivers/net/cxgb4 | |
| parent | 4580ccc04ddd8c17a470573a7fdb8def2e036dfa (diff) | |
| download | talos-op-linux-6a3c869a6021f4abcd69aa5fbb15c63f69eb36fe.tar.gz talos-op-linux-6a3c869a6021f4abcd69aa5fbb15c63f69eb36fe.zip | |
cxgb4: fix reported state of interfaces without link
Currently tools like ip and ifconfig report incorrect state for cxgb4
interfaces that are up but do not have link and do so until first link
establishment. This is because the initial netif_carrier_off call is
before register_netdev and it needs to be after to be fully effective.
Fix this by moving netif_carrier_off into .ndo_open.
Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb4')
| -rw-r--r-- | drivers/net/cxgb4/cxgb4_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c index 059c1eec8c3f..ec35d458102c 100644 --- a/drivers/net/cxgb4/cxgb4_main.c +++ b/drivers/net/cxgb4/cxgb4_main.c @@ -2710,6 +2710,8 @@ static int cxgb_open(struct net_device *dev) struct port_info *pi = netdev_priv(dev); struct adapter *adapter = pi->adapter; + netif_carrier_off(dev); + if (!(adapter->flags & FULL_INIT_DONE)) { err = cxgb_up(adapter); if (err < 0) @@ -3661,7 +3663,6 @@ static int __devinit init_one(struct pci_dev *pdev, pi->xact_addr_filt = -1; pi->rx_offload = RX_CSO; pi->port_id = i; - netif_carrier_off(netdev); netdev->irq = pdev->irq; netdev->features |= NETIF_F_SG | TSO_FLAGS; |
