32c32
< __FBSDID("$FreeBSD: head/sys/dev/cxgb/common/cxgb_xgmac.c 176472 2008-02-23 01:06:17Z kmacy $");
---
> __FBSDID("$FreeBSD: head/sys/dev/cxgb/common/cxgb_xgmac.c 180583 2008-07-18 06:12:31Z kmacy $");
47d46
< #define EXACT_ADDR_FILTERS 8
161a161
>
164a165
>
166c167,169
< if (is_10G(adap) || mac->multiport)
---
> if (!mac->multiport)
> val |= F_XG2G_RESET_;
> if (uses_xaui(adap))
168,169d170
< else if (uses_xaui(adap))
< val |= F_PCS_RESET_ | F_XG2G_RESET_;
171c172
< val |= F_RGMII_RESET_ | F_XG2G_RESET_;
---
> val |= F_RGMII_RESET_;
191,192c192,193
< if (!macidx(mac))
< t3_set_reg_field(adap, A_MPS_CFG, F_PORT0ACTIVE, 0);
---
> if (!macidx(mac))
> t3_set_reg_field(adap, A_MPS_CFG, F_PORT0ACTIVE, 0);
194c195
< t3_set_reg_field(adap, A_MPS_CFG, F_PORT1ACTIVE, 0);
---
> t3_set_reg_field(adap, A_MPS_CFG, F_PORT1ACTIVE, 0);
226c227
< t3_write_reg(adap, A_XGM_RX_CFG + oft,
---
> t3_write_reg(adap, A_XGM_RX_CFG + oft,
231,232c232,233
< if (!macidx(mac))
< t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT0ACTIVE);
---
> if (!macidx(mac))
> t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT0ACTIVE);
234c235
< t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT1ACTIVE);
---
> t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT1ACTIVE);
281a283,285
> *
> * Generally, this is 1 with the first one used for the station address,
> * and the rest are available for multicast addresses.
388c392
< int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
---
> int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
416c420
<
---
>
431,433c435,436
< V_RXMAXPKTSIZE(M_RXMAXPKTSIZE),
< V_RXMAXPKTSIZE(mtu));
<
---
> V_RXMAXPKTSIZE(M_RXMAXPKTSIZE),
> V_RXMAXPKTSIZE(mtu));
465,466c468,469
< t3_write_reg(adap, A_XGM_PAUSE_TIMER + mac->offset,
< (hwm - lwm) * 4 / divisor);
---
> t3_write_reg(adap, A_XGM_PAUSE_TIMER + mac->offset,
> (hwm - lwm) * 4 / divisor);
468c471
< t3_write_reg(adap, A_XGM_TX_PAUSE_QUANTA + mac->offset,
---
> t3_write_reg(adap, A_XGM_TX_PAUSE_QUANTA + mac->offset,
492c495
< if (mac->multiport) {
---
> if (mac->multiport) {
578c581
< if (which & MAC_DIRECTION_RX)
---
> if (which & MAC_DIRECTION_RX)
676c679
< mac->offset))) +
---
> mac->offset))) +
679c682
< } else
---
> } else
687,688c690,691
<
< out:
---
>
> out: