33c33
< /*$FreeBSD: head/sys/dev/e1000/if_igb.c 209611 2010-06-30 17:26:47Z jfv $*/
---
> /*$FreeBSD: head/sys/dev/e1000/if_igb.c 209616 2010-06-30 21:05:51Z jfv $*/
4856d4855
< ifp = adapter->ifp;
4878c4877
< ((E1000_READ_REG(hw, E1000_PBA) & 0xffff);
---
> (E1000_READ_REG(hw, E1000_PBA) & 0xffff);
4946c4945
< struct e1000_hw_stats *stats = &adapter->stats;
---
> struct e1000_hw_stats *stats = adapter->stats;
4997,4999c4996
< CTLFLAG_RD,
< E1000_READ_REG(&adapter->hw,
< E1000_TDH(txr->me)), 0,
---
> CTLFLAG_RD, &txr->tdh, 0,
5002,5004c4999
< CTLFLAG_RD,
< E1000_READ_REG(&adapter->hw,
< E1000_TDT(txr->me))), 0,
---
> CTLFLAG_RD, &txr->tdt, 0,
5059c5054
< CTLFLAG_RD, &adapter->stats.gprc,
---
> CTLFLAG_RD, &stats->gprc,
5062c5057
< CTLFLAG_RD, &adapter->stats.gptc,
---
> CTLFLAG_RD, &stats->gptc,
5065c5060
< CTLFLAG_RD, &adapter->stats.gorc,
---
> CTLFLAG_RD, &stats->gorc,
5068c5063
< CTLFLAG_RD, &adapter->stats.gotc,
---
> CTLFLAG_RD, &stats->gotc,
5071c5066
< CTLFLAG_RD, &adapter->stats.mprc,
---
> CTLFLAG_RD, &stats->mprc,
5092c5087
< CTLFLAG_RD, &adapter->stats.symerrs,
---
> CTLFLAG_RD, &stats->symerrs,
5095c5090
< CTLFLAG_RD, &adapter->stats.sec,
---
> CTLFLAG_RD, &stats->sec,
5098c5093
< CTLFLAG_RD, &adapter->stats.dc,
---
> CTLFLAG_RD, &stats->dc,
5101c5096
< CTLFLAG_RD, &adapter->stats.mpc,
---
> CTLFLAG_RD, &stats->mpc,
5104c5099
< CTLFLAG_RD, &adapter->stats.rnbc,
---
> CTLFLAG_RD, &stats->rnbc,
5107c5102
< CTLFLAG_RD, &adapter->stats.ruc,
---
> CTLFLAG_RD, &stats->ruc,
5110c5105
< CTLFLAG_RD, &adapter->stats.rfc,
---
> CTLFLAG_RD, &stats->rfc,
5113c5108
< CTLFLAG_RD, &adapter->stats.roc,
---
> CTLFLAG_RD, &stats->roc,
5116c5111
< CTLFLAG_RD, &adapter->stats.rjc,
---
> CTLFLAG_RD, &stats->rjc,
5119c5114
< CTLFLAG_RD, &adapter->stats.rxerrc,
---
> CTLFLAG_RD, &stats->rxerrc,
5122c5117
< CTLFLAG_RD, &adapter->stats.crcerrs,
---
> CTLFLAG_RD, &stats->crcerrs,
5125c5120
< CTLFLAG_RD, &adapter->stats.algnerrc,
---
> CTLFLAG_RD, &stats->algnerrc,
5129c5124
< CTLFLAG_RD, &adapter->stats.cexterr,
---
> CTLFLAG_RD, &stats->cexterr,
5138c5133
< CTLFLAG_RD, &adapter->stats.xonrxc,
---
> CTLFLAG_RD, &stats->xonrxc,
5141c5136
< CTLFLAG_RD, &adapter->stats.xontxc,
---
> CTLFLAG_RD, &stats->xontxc,
5144c5139
< CTLFLAG_RD, &adapter->stats.xoffrxc,
---
> CTLFLAG_RD, &stats->xoffrxc,
5147c5142
< CTLFLAG_RD, &adapter->stats.xofftxc,
---
> CTLFLAG_RD, &stats->xofftxc,
5151c5146
< CTLFLAG_RD, &adapter->stats.tpr,
---
> CTLFLAG_RD, &stats->tpr,
5154c5149
< CTLFLAG_RD, &adapter->stats.gprc,
---
> CTLFLAG_RD, &stats->gprc,
5157c5152
< CTLFLAG_RD, &adapter->stats.bprc,
---
> CTLFLAG_RD, &stats->bprc,
5160c5155
< CTLFLAG_RD, &adapter->stats.mprc,
---
> CTLFLAG_RD, &stats->mprc,
5163c5158
< CTLFLAG_RD, &adapter->stats.prc64,
---
> CTLFLAG_RD, &stats->prc64,
5166c5161
< CTLFLAG_RD, &adapter->stats.prc127,
---
> CTLFLAG_RD, &stats->prc127,
5169c5164
< CTLFLAG_RD, &adapter->stats.prc255,
---
> CTLFLAG_RD, &stats->prc255,
5172c5167
< CTLFLAG_RD, &adapter->stats.prc511,
---
> CTLFLAG_RD, &stats->prc511,
5175c5170
< CTLFLAG_RD, &adapter->stats.prc1023,
---
> CTLFLAG_RD, &stats->prc1023,
5178c5173
< CTLFLAG_RD, &adapter->stats.prc1522,
---
> CTLFLAG_RD, &stats->prc1522,
5181c5176
< CTLFLAG_RD, &adapter->stats.gorc,
---
> CTLFLAG_RD, &stats->gorc,
5186c5181
< CTLFLAG_RD, &adapter->stats.gotc,
---
> CTLFLAG_RD, &stats->gotc,
5189c5184
< CTLFLAG_RD, &adapter->stats.tpt,
---
> CTLFLAG_RD, &stats->tpt,
5192c5187
< CTLFLAG_RD, &adapter->stats.gptc,
---
> CTLFLAG_RD, &stats->gptc,
5195c5190
< CTLFLAG_RD, &adapter->stats.bptc,
---
> CTLFLAG_RD, &stats->bptc,
5198c5193
< CTLFLAG_RD, &adapter->stats.mptc,
---
> CTLFLAG_RD, &stats->mptc,
5201c5196
< CTLFLAG_RD, &adapter->stats.ptc64,
---
> CTLFLAG_RD, &stats->ptc64,
5204c5199
< CTLFLAG_RD, &adapter->stats.ptc127,
---
> CTLFLAG_RD, &stats->ptc127,
5207c5202
< CTLFLAG_RD, &adapter->stats.ptc255,
---
> CTLFLAG_RD, &stats->ptc255,
5210c5205
< CTLFLAG_RD, &adapter->stats.ptc511,
---
> CTLFLAG_RD, &stats->ptc511,
5213c5208
< CTLFLAG_RD, &adapter->stats.ptc1023,
---
> CTLFLAG_RD, &stats->ptc1023,
5216c5211
< CTLFLAG_RD, &adapter->stats.ptc1522,
---
> CTLFLAG_RD, &stats->ptc1522,
5219c5214
< CTLFLAG_RD, &adapter->stats.tsctc,
---
> CTLFLAG_RD, &stats->tsctc,
5222c5217
< CTLFLAG_RD, &adapter->stats.tsctfc,
---
> CTLFLAG_RD, &stats->tsctfc,
5233c5228
< CTLFLAG_RD, &adapter->stats.iac,
---
> CTLFLAG_RD, &stats->iac,
5237c5232
< CTLFLAG_RD, &adapter->stats.icrxptc,
---
> CTLFLAG_RD, &stats->icrxptc,
5241c5236
< CTLFLAG_RD, &adapter->stats.icrxatc,
---
> CTLFLAG_RD, &stats->icrxatc,
5245c5240
< CTLFLAG_RD, &adapter->stats.ictxptc,
---
> CTLFLAG_RD, &stats->ictxptc,
5249c5244
< CTLFLAG_RD, &adapter->stats.ictxatc,
---
> CTLFLAG_RD, &stats->ictxatc,
5253c5248
< CTLFLAG_RD, &adapter->stats.ictxqec,
---
> CTLFLAG_RD, &stats->ictxqec,
5257c5252
< CTLFLAG_RD, &adapter->stats.ictxqmtc,
---
> CTLFLAG_RD, &stats->ictxqmtc,
5261c5256
< CTLFLAG_RD, &adapter->stats.icrxdmtc,
---
> CTLFLAG_RD, &stats->icrxdmtc,
5265c5260
< CTLFLAG_RD, &adapter->stats.icrxoc,
---
> CTLFLAG_RD, &stats->icrxoc,
5277c5272
< CTLFLAG_RD, &adapter->stats.cbtmpc,
---
> CTLFLAG_RD, &stats->cbtmpc,
5281c5276
< CTLFLAG_RD, &adapter->stats.htdpmc,
---
> CTLFLAG_RD, &stats->htdpmc,
5285c5280
< CTLFLAG_RD, &adapter->stats.rpthc,
---
> CTLFLAG_RD, &stats->rpthc,
5289c5284
< CTLFLAG_RD, &adapter->stats.cbrmpc,
---
> CTLFLAG_RD, &stats->cbrmpc,
5293c5288
< CTLFLAG_RD, &adapter->stats.cbrdpc,
---
> CTLFLAG_RD, &stats->cbrdpc,
5297c5292
< CTLFLAG_RD, &adapter->stats.hgptc,
---
> CTLFLAG_RD, &stats->hgptc,
5301c5296
< CTLFLAG_RD, &adapter->stats.htcbdpc,
---
> CTLFLAG_RD, &stats->htcbdpc,
5305c5300
< CTLFLAG_RD, &adapter->stats.hgorc,
---
> CTLFLAG_RD, &stats->hgorc,
5309c5304
< CTLFLAG_RD, &adapter->stats.hgotc,
---
> CTLFLAG_RD, &stats->hgotc,
5313c5308
< CTLFLAG_RD, &adapter->stats.lenerrs,
---
> CTLFLAG_RD, &stats->lenerrs,
5317c5312
< CTLFLAG_RD, &adapter->stats.scvpc,
---
> CTLFLAG_RD, &stats->scvpc,
5321c5316
< CTLFLAG_RD, &adapter->stats.hrmpc,
---
> CTLFLAG_RD, &stats->hrmpc,