Commit ad4c9a09 authored by Ron Mercer's avatar Ron Mercer Committed by Jeff Garzik
Browse files

qla3xxx: bugfix: Fix bad logical operation in link state machine. 



Luckily, this wasn't reported or reproduced. The logical operation for
setting duplex had wrong grouping.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 3e23b7d3

drivers/net/qla3xxx.c

+5 −10
Original line number Diff line number Diff line
@@ -1456,15 +1456,10 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev) 
			   PHYAddr[qdev->mac_index]);

	reg &= ~PHY_GIG_ALL_PARAMS;



	if(portConfiguration &

	   PORT_CONFIG_FULL_DUPLEX_ENABLED &

	   PORT_CONFIG_1000MB_SPEED) {

	if(portConfiguration & PORT_CONFIG_1000MB_SPEED) {

		if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) 

			reg |= PHY_GIG_ADV_1000F;

	}



	if(portConfiguration &

	   PORT_CONFIG_HALF_DUPLEX_ENABLED &

	   PORT_CONFIG_1000MB_SPEED) {

		else 

			reg |= PHY_GIG_ADV_1000H;

	}