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

Commit 24cb230b authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[BNX2]: Fix 2nd port's MAC address. 



On the 5709, we need to add the proper offset to calculate the shared
memory base address of the 2nd port correctly.  Otherwise, the 2nd
port's MAC address and other information will be the same as the 1st
port.

Update version to 1.5.4.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db3ccdac

drivers/net/bnx2.c

+7 −5
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ 


#define DRV_MODULE_NAME		"bnx2"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"1.5.3"

#define DRV_MODULE_RELDATE	"January 8, 2007"

#define DRV_MODULE_VERSION	"1.5.4"

#define DRV_MODULE_RELDATE	"January 24, 2007"



#define RUN_AT(x) (jiffies + (x))
@@ -5845,9 +5845,11 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) 
	reg = REG_RD_IND(bp, BNX2_SHM_HDR_SIGNATURE);



	if ((reg & BNX2_SHM_HDR_SIGNATURE_SIG_MASK) ==

	    BNX2_SHM_HDR_SIGNATURE_SIG)

		bp->shmem_base = REG_RD_IND(bp, BNX2_SHM_HDR_ADDR_0);

	else

	    BNX2_SHM_HDR_SIGNATURE_SIG) {

		u32 off = PCI_FUNC(pdev->devfn) << 2;



		bp->shmem_base = REG_RD_IND(bp, BNX2_SHM_HDR_ADDR_0 + off);

	} else

		bp->shmem_base = HOST_VIEW_SHMEM_BASE;



	/* Get the permanent MAC address.  First we need to make sure the