Commit a5f59dc9 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: Clear frame to queue routing before reset. 



Not clearing the routing bits can cause frames to erroneously get routed to
management processor.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4322c5be

drivers/net/qlge/qlge_main.c

+32 −9
Original line number Diff line number Diff line
@@ -3040,26 +3040,41 @@ static int ql_start_rss(struct ql_adapter *qdev) 
	return status;

}



/* Initialize the frame-to-queue routing. */

static int ql_route_initialize(struct ql_adapter *qdev)

static int ql_clear_routing_entries(struct ql_adapter *qdev)

{

	int status = 0;

	int i;

	int i, status = 0;



	status = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK);

	if (status)

		return status;



	/* Clear all the entries in the routing table. */

	for (i = 0; i < 16; i++) {

		status = ql_set_routing_reg(qdev, i, 0, 0);

		if (status) {

			QPRINTK(qdev, IFUP, ERR,

				"Failed to init routing register for CAM packets.\n");

			goto exit;

				"Failed to init routing register for CAM "

				"packets.\n");

			break;

		}

	}

	ql_sem_unlock(qdev, SEM_RT_IDX_MASK);

	return status;

}



/* Initialize the frame-to-queue routing. */

static int ql_route_initialize(struct ql_adapter *qdev)

{

	int status = 0;



	status = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK);

	if (status)

		return status;



	/* Clear all the entries in the routing table. */

	status = ql_clear_routing_entries(qdev);

	if (status)

		goto exit;



	status = ql_set_routing_reg(qdev, RT_IDX_ALL_ERR_SLOT, RT_IDX_ERR, 1);

	if (status) {

		QPRINTK(qdev, IFUP, ERR,
@@ -3211,9 +3226,17 @@ static int ql_adapter_reset(struct ql_adapter *qdev) 
{

	u32 value;

	int status = 0;

	unsigned long end_jiffies = jiffies +

		max((unsigned long)1, usecs_to_jiffies(30));

	unsigned long end_jiffies;



	/* Clear all the entries in the routing table. */

	status = ql_clear_routing_entries(qdev);

	if (status) {

		QPRINTK(qdev, IFUP, ERR, "Failed to clear routing bits.\n");

		return status;

	}



	end_jiffies = jiffies +

		max((unsigned long)1, usecs_to_jiffies(30));

	ql_write32(qdev, RST_FO, (RST_FO_FR << 16) | RST_FO_FR);



	do {