Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 143431
b: refs/heads/master
c: 0d489ff
h: refs/heads/master
i:
  143429: fad2cb5
  143427: 40231c3
  143423: c732cb3
v: v3
  • Loading branch information
James Bottomley authored and David S. Miller committed Apr 13, 2009
1 parent 8d1286a commit 1af3ad9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5a31bec014449dc9ca994e4c1dbf2802b7ca458a
refs/heads/master: 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9
9 changes: 7 additions & 2 deletions trunk/drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -12443,8 +12443,13 @@ static int __devinit tg3_get_device_address(struct tg3 *tp)
/* Next, try NVRAM. */
if (!tg3_nvram_read_be32(tp, mac_offset + 0, &hi) &&
!tg3_nvram_read_be32(tp, mac_offset + 4, &lo)) {
memcpy(&dev->dev_addr[0], ((char *)&hi) + 2, 2);
memcpy(&dev->dev_addr[2], (char *)&lo, sizeof(lo));
dev->dev_addr[0] = ((hi >> 16) & 0xff);
dev->dev_addr[1] = ((hi >> 24) & 0xff);
dev->dev_addr[2] = ((lo >> 0) & 0xff);
dev->dev_addr[3] = ((lo >> 8) & 0xff);
dev->dev_addr[4] = ((lo >> 16) & 0xff);
dev->dev_addr[5] = ((lo >> 24) & 0xff);

}
/* Finally just fetch it out of the MAC control regs. */
else {
Expand Down

0 comments on commit 1af3ad9

Please sign in to comment.