From c9f6784d41a2f8a640889e303b812ec288b352ed Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Wed, 23 Nov 2005 12:49:47 +0100 Subject: [PATCH] --- yaml --- r: 15771 b: refs/heads/master c: 0b85c0ebde63a41d57b6214977ac2752bf5a086f h: refs/heads/master i: 15769: 87b12dae0797012d89722e5a5c968c1b73ef3930 15767: 43f8c39e8852621c2475d8eea3389d3f14db35af v: v3 --- [refs] | 2 +- trunk/drivers/net/ixp2000/pm3386.c | 7 +++++++ trunk/drivers/net/ixp2000/pm3386.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f906fa816a4b..bf9f65ed5c7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ed98bfdea45dbdc66261660357659470935a03a +refs/heads/master: 0b85c0ebde63a41d57b6214977ac2752bf5a086f diff --git a/trunk/drivers/net/ixp2000/pm3386.c b/trunk/drivers/net/ixp2000/pm3386.c index 267b6bd5f79f..870b486f5dea 100644 --- a/trunk/drivers/net/ixp2000/pm3386.c +++ b/trunk/drivers/net/ixp2000/pm3386.c @@ -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; diff --git a/trunk/drivers/net/ixp2000/pm3386.h b/trunk/drivers/net/ixp2000/pm3386.h index 55ecb1834219..117f50afcdea 100644 --- a/trunk/drivers/net/ixp2000/pm3386.h +++ b/trunk/drivers/net/ixp2000/pm3386.h @@ -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);