aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/xgmac.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-11-23 21:59:45 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:04:13 -0500
commit2eab17ab880ad8d570d27517e6c9d9fe74adc214 (patch)
tree17baf30d2ae574defcad6c57782ef0192ef7ab9b /drivers/net/cxgb3/xgmac.c
parentafefce66a5c73aef597074b184b83a4df9704afd (diff)
drivers/net/cxgb3: trim trailing whitespace
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/cxgb3/xgmac.c')
-rw-r--r--drivers/net/cxgb3/xgmac.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index efcf09a709cf..ffdc0a1892bd 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -153,7 +153,7 @@ static int t3b2_mac_reset(struct cmac *mac)
153 unsigned int oft = mac->offset; 153 unsigned int oft = mac->offset;
154 u32 val; 154 u32 val;
155 155
156 if (!macidx(mac)) 156 if (!macidx(mac))
157 t3_set_reg_field(adap, A_MPS_CFG, F_PORT0ACTIVE, 0); 157 t3_set_reg_field(adap, A_MPS_CFG, F_PORT0ACTIVE, 0);
158 else 158 else
159 t3_set_reg_field(adap, A_MPS_CFG, F_PORT1ACTIVE, 0); 159 t3_set_reg_field(adap, A_MPS_CFG, F_PORT1ACTIVE, 0);
@@ -187,11 +187,11 @@ static int t3b2_mac_reset(struct cmac *mac)
187 msleep(1); 187 msleep(1);
188 t3b_pcs_reset(mac); 188 t3b_pcs_reset(mac);
189 } 189 }
190 t3_write_reg(adap, A_XGM_RX_CFG + oft, 190 t3_write_reg(adap, A_XGM_RX_CFG + oft,
191 F_DISPAUSEFRAMES | F_EN1536BFRAMES | 191 F_DISPAUSEFRAMES | F_EN1536BFRAMES |
192 F_RMFCS | F_ENJUMBO | F_ENHASHMCAST); 192 F_RMFCS | F_ENJUMBO | F_ENHASHMCAST);
193 193
194 if (!macidx(mac)) 194 if (!macidx(mac))
195 t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT0ACTIVE); 195 t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT0ACTIVE);
196 else 196 else
197 t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT1ACTIVE); 197 t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT1ACTIVE);
@@ -336,7 +336,7 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
336 * Adjust the PAUSE frame watermarks. We always set the LWM, and the 336 * Adjust the PAUSE frame watermarks. We always set the LWM, and the
337 * HWM only if flow-control is enabled. 337 * HWM only if flow-control is enabled.
338 */ 338 */
339 hwm = max_t(unsigned int, MAC_RXFIFO_SIZE - 3 * mtu, 339 hwm = max_t(unsigned int, MAC_RXFIFO_SIZE - 3 * mtu,
340 MAC_RXFIFO_SIZE * 38 / 100); 340 MAC_RXFIFO_SIZE * 38 / 100);
341 hwm = min(hwm, MAC_RXFIFO_SIZE - 8192); 341 hwm = min(hwm, MAC_RXFIFO_SIZE - 8192);
342 lwm = min(3 * (int)mtu, MAC_RXFIFO_SIZE / 4); 342 lwm = min(3 * (int)mtu, MAC_RXFIFO_SIZE / 4);
@@ -449,7 +449,7 @@ int t3_mac_enable(struct cmac *mac, int which)
449 struct adapter *adap = mac->adapter; 449 struct adapter *adap = mac->adapter;
450 unsigned int oft = mac->offset; 450 unsigned int oft = mac->offset;
451 struct mac_stats *s = &mac->stats; 451 struct mac_stats *s = &mac->stats;
452 452
453 if (which & MAC_DIRECTION_TX) { 453 if (which & MAC_DIRECTION_TX) {
454 t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CFG_CH0 + idx); 454 t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CFG_CH0 + idx);
455 t3_write_reg(adap, A_TP_PIO_DATA, 0xc0ede401); 455 t3_write_reg(adap, A_TP_PIO_DATA, 0xc0ede401);