Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e78f7fd authored by Ganesh Goudar's avatar Ganesh Goudar Committed by David S. Miller
Browse files

cxgb4/cxgb4vf: Display 25G and 100G link speed 



Add support to report 25G and 100G links, which was missed
as part of commit "eb97ad99".

Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5e70991

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+13 −7
Original line number Diff line number Diff line
@@ -188,18 +188,24 @@ static void link_report(struct net_device *dev) 
		const struct port_info *p = netdev_priv(dev);



		switch (p->link_cfg.speed) {

		case 10000:

			s = "10Gbps";

		case 100:

			s = "100Mbps";

			break;

		case 1000:

			s = "1000Mbps";

			s = "1Gbps";

			break;

		case 100:

			s = "100Mbps";

		case 10000:

			s = "10Gbps";

			break;

		case 25000:

			s = "25Gbps";

			break;

		case 40000:

			s = "40Gbps";

			break;

		case 100000:

			s = "100Gbps";

			break;

		default:

			pr_info("%s: unsupported speed: %d\n",

				dev->name, p->link_cfg.speed);
@@ -4397,9 +4403,9 @@ static void print_port_info(const struct net_device *dev) 
		spd = " 8 GT/s";



	if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_100M)

		bufp += sprintf(bufp, "100/");

		bufp += sprintf(bufp, "100M/");

	if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_1G)

		bufp += sprintf(bufp, "1000/");

		bufp += sprintf(bufp, "1G/");

	if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_10G)

		bufp += sprintf(bufp, "10G/");

	if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_25G)

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

+12 −9
Original line number Diff line number Diff line
@@ -158,20 +158,23 @@ void t4vf_os_link_changed(struct adapter *adapter, int pidx, int link_ok) 
		netif_carrier_on(dev);



		switch (pi->link_cfg.speed) {

		case 40000:

			s = "40Gbps";

		case 100:

			s = "100Mbps";

			break;

		case 1000:

			s = "1Gbps";

			break;



		case 10000:

			s = "10Gbps";

			break;



		case 1000:

			s = "1000Mbps";

		case 25000:

			s = "25Gbps";

			break;



		case 100:

			s = "100Mbps";

		case 40000:

			s = "40Gbps";

			break;

		case 100000:

			s = "100Gbps";

			break;



		default: