diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-02-20 13:35:01 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-02-20 13:35:01 -0500 |
| commit | 84094b6acf34b8be93624fbce1adcda0692f55e6 (patch) | |
| tree | 3096c412e781fe43c35c2c5025568426266e11bf /drivers/net/s2io.c | |
| parent | 1a997b0e788bf0310e25d5861e8460dfe6dcdb1c (diff) | |
| parent | 23bf8bba8519a2d1e4103a36860d96053c61efdd (diff) | |
Merge modernduck.com:/usr/src/bk/1394-2.6
into modernduck.com:/usr/src/bk/1394-dev
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index f8ef1606c30f..001a56254efc 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -3025,6 +3025,8 @@ static void s2io_set_multicast(struct net_device *dev) for (i = 0; i < prev_cnt; i++) { writeq(RMAC_ADDR_DATA0_MEM_ADDR(dis_addr), &bar0->rmac_addr_data0_mem); + writeq(RMAC_ADDR_DATA1_MEM_MASK(0ULL), + &bar0->rmac_addr_data1_mem); val64 = RMAC_ADDR_CMD_MEM_WE | RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD | RMAC_ADDR_CMD_MEM_OFFSET @@ -3049,8 +3051,11 @@ static void s2io_set_multicast(struct net_device *dev) mac_addr |= mclist->dmi_addr[j]; mac_addr <<= 8; } + mac_addr >>= 8; writeq(RMAC_ADDR_DATA0_MEM_ADDR(mac_addr), &bar0->rmac_addr_data0_mem); + writeq(RMAC_ADDR_DATA1_MEM_MASK(0ULL), + &bar0->rmac_addr_data1_mem); val64 = RMAC_ADDR_CMD_MEM_WE | RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD | |