Commit 502c1a16 authored by Arjun Vynipadath's avatar Arjun Vynipadath Committed by David S. Miller
Browse files

cxgb4vf: Revert force link up behaviour 



Reverting force link up changes since this behaviour can be
achieved using VF link state feature.

Reverts:
commit 0913667a ("cxgb4vf: Forcefully link up virtual interfaces")

Signed-off-by: default avatarArjun Vynipadath <arjun@chelsio.com>
Signed-off-by: default avatarVishal Kulkarni <vishal@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b965f3f

drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c

+3 −10
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ void t4vf_os_link_changed(struct adapter *adapter, int pidx, int link_ok) 
		const char *fc;

		const struct port_info *pi = netdev_priv(dev);



		netif_carrier_on(dev);



		switch (pi->link_cfg.speed) {

		case 100:

			s = "100Mbps";
@@ -200,6 +202,7 @@ void t4vf_os_link_changed(struct adapter *adapter, int pidx, int link_ok) 


		netdev_info(dev, "link up, %s, full-duplex, %s PAUSE\n", s, fc);

	} else {

		netif_carrier_off(dev);

		netdev_info(dev, "link down\n");

	}

}
@@ -339,16 +342,6 @@ static int link_start(struct net_device *dev) 
	if (ret == 0)

		ret = t4vf_enable_pi(pi->adapter, pi, true, true);



	/* The Virtual Interfaces are connected to an internal switch on the

	 * chip which allows VIs attached to the same port to talk to each

	 * other even when the port link is down.  As a result, we generally

	 * want to always report a VI's link as being "up", provided there are

	 * no errors in enabling vi.

	 */



	if (ret == 0)

		netif_carrier_on(dev);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE