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

This project is archived. Its data is read-only.

Commit ad4c9a09 authored Nov 07, 2007 by Ron Mercer Committed by Jeff Garzik Nov 10, 2007

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: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 3e23b7d3

drivers/net/qla3xxx.c

+5 −10

Original line number	Original line	Diff line number	Diff line
	@@ -1456,15 +1456,10 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev)
	PHYAddr[qdev->mac_index]);		PHYAddr[qdev->mac_index]);
	reg &= ~PHY_GIG_ALL_PARAMS;		reg &= ~PHY_GIG_ALL_PARAMS;

	if(portConfiguration &		if(portConfiguration & PORT_CONFIG_1000MB_SPEED) {
	PORT_CONFIG_FULL_DUPLEX_ENABLED &		if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED)
	PORT_CONFIG_1000MB_SPEED) {
	reg \|= PHY_GIG_ADV_1000F;		reg \|= PHY_GIG_ADV_1000F;
	}		else

	if(portConfiguration &
	PORT_CONFIG_HALF_DUPLEX_ENABLED &
	PORT_CONFIG_1000MB_SPEED) {
	reg \|= PHY_GIG_ADV_1000H;		reg \|= PHY_GIG_ADV_1000H;
	}		}