diff options
| author | Divy Le Ray <divy@chelsio.com> | 2009-07-07 19:48:38 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-08 10:54:22 -0700 |
| commit | cfe2462c6af309ee70e4aeefa55cae976071b9e2 (patch) | |
| tree | e6c67157fa4ed3ed0a49edf6732c7cbed48b17fe /drivers/net/cxgb3 | |
| parent | 619f05cf690149bef1f15cd0cec6a31b40d96951 (diff) | |
| download | talos-obmc-linux-cfe2462c6af309ee70e4aeefa55cae976071b9e2.tar.gz talos-obmc-linux-cfe2462c6af309ee70e4aeefa55cae976071b9e2.zip | |
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')
| -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) val = t3_read_reg(adap, A_XGM_RXFIFO_CFG + oft); val &= ~V_RXFIFOPAUSEHWM(M_RXFIFOPAUSEHWM); - if (fc & PAUSE_TX) - val |= V_RXFIFOPAUSEHWM(rx_fifo_hwm( - t3_read_reg(adap, - A_XGM_RX_MAX_PKT_SIZE - + oft)) / 8); + if (fc & PAUSE_TX) { + u32 rx_max_pkt_size = + G_RXMAXPKTSIZE(t3_read_reg(adap, + A_XGM_RX_MAX_PKT_SIZE + oft)); + val |= V_RXFIFOPAUSEHWM(rx_fifo_hwm(rx_max_pkt_size) / 8); + } t3_write_reg(adap, A_XGM_RXFIFO_CFG + oft, val); t3_set_reg_field(adap, A_XGM_TX_CFG + oft, F_TXPAUSEEN, |
