Commit 6a3c869a authored Jan 19, 2011 by Dimitris Michailidis Committed by David S. Miller Jan 20, 2011

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>

parent 4580ccc0

drivers/net/cxgb4/cxgb4_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;