35c35
< __FBSDID("$FreeBSD: head/sys/dev/bge/if_bge.c 164769 2006-11-30 13:40:39Z glebius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/bge/if_bge.c 164780 2006-12-01 01:08:52Z jkim $");
2982d2981
< struct bge_mac_stats_regs stats;
2984,2986c2983
< uint32_t *s;
< u_long cnt; /* current register value */
< int i;
---
> uint32_t cnt; /* current register value */
2990,3001c2987,2989
< s = (uint32_t *)&stats;
< for (i = 0; i < sizeof(struct bge_mac_stats_regs); i += 4) {
< *s = CSR_READ_4(sc, BGE_RX_STATS + i);
< s++;
< }
<
< cnt = stats.dot3StatsSingleCollisionFrames +
< stats.dot3StatsMultipleCollisionFrames +
< stats.dot3StatsExcessiveCollisions +
< stats.dot3StatsLateCollisions;
< ifp->if_collisions += cnt >= sc->bge_tx_collisions ?
< cnt - sc->bge_tx_collisions : cnt;
---
> cnt = CSR_READ_4(sc, BGE_MAC_STATS +
> offsetof(struct bge_mac_stats_regs, etherStatsCollisions));
> ifp->if_collisions += (u_long)(cnt - sc->bge_tx_collisions);
3002a2991,2994
>
> cnt = CSR_READ_4(sc, BGE_RXLP_LOCSTAT_IFIN_DROPS);
> ifp->if_ierrors += (u_long)(cnt - sc->bge_rx_discards);
> sc->bge_rx_discards = cnt;
3010c3002
< u_long cnt; /* current register value */
---
> uint32_t cnt; /* current register value */
3027,3028c3019
< ifp->if_collisions += cnt >= sc->bge_tx_collisions ?
< cnt - sc->bge_tx_collisions : cnt;
---
> ifp->if_collisions += (u_long)(cnt - sc->bge_tx_collisions);
3032,3033c3023
< ifp->if_ierrors += cnt >= sc->bge_rx_discards ?
< cnt - sc->bge_rx_discards : cnt;
---
> ifp->if_ierrors += (u_long)(cnt - sc->bge_rx_discards);
3037,3038c3027
< ifp->if_oerrors += cnt >= sc->bge_tx_discards ?
< cnt - sc->bge_tx_discards : cnt;
---
> ifp->if_oerrors += (u_long)(cnt - sc->bge_tx_discards);
3371a3361,3363
> /* Init our RX/TX stat counters. */
> sc->bge_rx_discards = sc->bge_tx_discards = sc->bge_tx_collisions = 0;
>