diff options
author | Divy Le Ray <divy@chelsio.com> | 2009-07-07 15:48:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-08 13:54:22 -0400 |
commit | cfe2462c6af309ee70e4aeefa55cae976071b9e2 (patch) | |
tree | e6c67157fa4ed3ed0a49edf6732c7cbed48b17fe /drivers/net/cxgb3/xgmac.c | |
parent | 619f05cf690149bef1f15cd0cec6a31b40d96951 (diff) |
cxgb3: Fix T3C MAC max packet size access
Max packet size is not the only field in T3C's High Water Mark register.
Mask the register to access this field.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/xgmac.c')
-rw-r--r-- | drivers/net/cxgb3/xgmac.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c index f87f9435049f..0109ee4f2f91 100644 --- a/drivers/net/cxgb3/xgmac.c +++ b/drivers/net/cxgb3/xgmac.c | |||
@@ -447,11 +447,12 @@ int t3_mac_set_speed_duplex_fc(struct cmac *mac, int speed, int duplex, int fc) | |||
447 | 447 | ||
448 | val = t3_read_reg(adap, A_XGM_RXFIFO_CFG + oft); | 448 | val = t3_read_reg(adap, A_XGM_RXFIFO_CFG + oft); |
449 | val &= ~V_RXFIFOPAUSEHWM(M_RXFIFOPAUSEHWM); | 449 | val &= ~V_RXFIFOPAUSEHWM(M_RXFIFOPAUSEHWM); |
450 | if (fc & PAUSE_TX) | 450 | if (fc & PAUSE_TX) { |
451 | val |= V_RXFIFOPAUSEHWM(rx_fifo_hwm( | 451 | u32 rx_max_pkt_size = |
452 | t3_read_reg(adap, | 452 | G_RXMAXPKTSIZE(t3_read_reg(adap, |
453 | A_XGM_RX_MAX_PKT_SIZE | 453 | A_XGM_RX_MAX_PKT_SIZE + oft)); |
454 | + oft)) / 8); | 454 | val |= V_RXFIFOPAUSEHWM(rx_fifo_hwm(rx_max_pkt_size) / 8); |
455 | } | ||
455 | t3_write_reg(adap, A_XGM_RXFIFO_CFG + oft, val); | 456 | t3_write_reg(adap, A_XGM_RXFIFO_CFG + oft, val); |
456 | 457 | ||
457 | t3_set_reg_field(adap, A_XGM_TX_CFG + oft, F_TXPAUSEEN, | 458 | t3_set_reg_field(adap, A_XGM_TX_CFG + oft, F_TXPAUSEEN, |