diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-14 13:13:25 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-14 13:13:25 -0800 |
| commit | 546e877ea461404550f01a1066242c2f2610ad9d (patch) | |
| tree | 839e6f3904342af8f6f35e71fd8b8604409e4dbc /firmware/microblaze/lib/eth_mac.c | |
| parent | 3ed60b62eaf2d907ec7797f61ca60420bfd2ee5b (diff) | |
| parent | 4d9b9ae7e9fe36bf7c1e2e60a37845e9cc4ecee3 (diff) | |
| download | uhd-546e877ea461404550f01a1066242c2f2610ad9d.tar.gz uhd-546e877ea461404550f01a1066242c2f2610ad9d.tar.bz2 uhd-546e877ea461404550f01a1066242c2f2610ad9d.zip | |
Merge branch 'packet_router' into next
Diffstat (limited to 'firmware/microblaze/lib/eth_mac.c')
| -rw-r--r-- | firmware/microblaze/lib/eth_mac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/firmware/microblaze/lib/eth_mac.c b/firmware/microblaze/lib/eth_mac.c index 034a4d494..581a5c69f 100644 --- a/firmware/microblaze/lib/eth_mac.c +++ b/firmware/microblaze/lib/eth_mac.c @@ -28,6 +28,7 @@ void eth_mac_set_addr(const eth_mac_addr_t *src) { + /* disable because MAC_SET_PASS_ALL is set below eth_mac->ucast_hi = (((unsigned int)src->addr[0])<<8) + ((unsigned int)src->addr[1]); @@ -36,6 +37,7 @@ eth_mac_set_addr(const eth_mac_addr_t *src) (((unsigned int)src->addr[3])<<16) + (((unsigned int)src->addr[4])<<8) + (((unsigned int)src->addr[5])); +*/ } @@ -45,7 +47,7 @@ eth_mac_init(const eth_mac_addr_t *src) eth_mac->miimoder = 25; // divider from CPU clock (50MHz/25 = 2MHz) eth_mac_set_addr(src); - eth_mac->settings = MAC_SET_PAUSE_EN | MAC_SET_PASS_BCAST | MAC_SET_PASS_UCAST | MAC_SET_PAUSE_SEND_EN; + eth_mac->settings = MAC_SET_PAUSE_EN | MAC_SET_PASS_BCAST | MAC_SET_PASS_UCAST | MAC_SET_PAUSE_SEND_EN | MAC_SET_PASS_ALL; eth_mac->pause_time = 38; eth_mac->pause_thresh = 1200; |