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

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

qlge: bugfix: Add flash offset for second port. 



Without this the 2nd port gets first ports MAC addr.

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

drivers/net/qlge/qlge_main.c

+8 −1
Original line number Diff line number Diff line
@@ -670,12 +670,19 @@ static int ql_get_flash_params(struct ql_adapter *qdev) 
	int i;

	int status;

	__le32 *p = (__le32 *)&qdev->flash;

	u32 offset = 0;



	/* Second function's parameters follow the first

	 * function's.

	 */

	if (qdev->func)

		offset = sizeof(qdev->flash) / sizeof(u32);



	if (ql_sem_spinlock(qdev, SEM_FLASH_MASK))

		return -ETIMEDOUT;



	for (i = 0; i < sizeof(qdev->flash) / sizeof(u32); i++, p++) {

		status = ql_read_flash_word(qdev, i, p);

		status = ql_read_flash_word(qdev, i+offset, p);

		if (status) {

			QPRINTK(qdev, IFUP, ERR, "Error reading flash.\n");

			goto exit;