Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 15771
b: refs/heads/master
c: 0b85c0e
h: refs/heads/master
i:
  15769: 87b12da
  15767: 43f8c39
v: v3
  • Loading branch information
Lennert Buytenhek authored and Jeff Garzik committed Dec 1, 2005
1 parent d4fc96e commit c9f6784
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7ed98bfdea45dbdc66261660357659470935a03a
refs/heads/master: 0b85c0ebde63a41d57b6214977ac2752bf5a086f
7 changes: 7 additions & 0 deletions trunk/drivers/net/ixp2000/pm3386.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ void pm3386_get_mac(int port, u8 *mac)
mac[5] = (temp >> 8) & 0xff;
}

void pm3386_set_mac(int port, u8 *mac)
{
pm3386_port_reg_write(port, 0x308, 0x100, (mac[1] << 8) | mac[0]);
pm3386_port_reg_write(port, 0x309, 0x100, (mac[3] << 8) | mac[2]);
pm3386_port_reg_write(port, 0x30a, 0x100, (mac[5] << 8) | mac[4]);
}

static u32 pm3386_get_stat(int port, u16 base)
{
u32 value;
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/net/ixp2000/pm3386.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
void pm3386_reset(void);
void pm3386_init_port(int port);
void pm3386_get_mac(int port, u8 *mac);
void pm3386_set_mac(int port, u8 *mac);
void pm3386_get_stats(int port, struct net_device_stats *stats);
int pm3386_is_link_up(int port);
void pm3386_enable_rx(int port);
Expand Down

0 comments on commit c9f6784

Please sign in to comment.