d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the initialization of the hardware capabilities in em_init_locked()

Browse Source 
before em_setup_transmit_structures() as it needs this information to
properly set up TSO parameters.

Reviewed by:	jfv
This commit is contained in:
andre 2006-09-21 19:14:51 +00:00
parent 74c395cf51
commit ab54ab783b
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/em/if_em.c
View File

@ -1058,6 +1058,18 @@ em_init_locked(struct adapter *adapter)
if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
em_enable_vlans(adapter); em_enable_vlans(adapter);
ifp->if_hwassist = 0;
if (adapter->hw.mac_type >= em_82543) {
if (ifp->if_capenable & IFCAP_TXCSUM)
ifp->if_hwassist = EM_CHECKSUM_FEATURES;
/*
* em_setup_transmit_structures() will behave differently
* based on the state of TSO.
*/
if (ifp->if_capenable & IFCAP_TSO)
ifp->if_hwassist |= EM_TCPSEG_FEATURES;
}
/* Prepare transmit descriptors and buffers */ /* Prepare transmit descriptors and buffers */
if (em_setup_transmit_structures(adapter)) { if (em_setup_transmit_structures(adapter)) {
device_printf(dev, "Could not setup transmit structures\n"); device_printf(dev, "Could not setup transmit structures\n");
@ -1083,14 +1095,6 @@ em_init_locked(struct adapter *adapter)
ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
ifp->if_hwassist = 0;
if (adapter->hw.mac_type >= em_82543) {
if (ifp->if_capenable & IFCAP_TXCSUM)
ifp->if_hwassist = EM_CHECKSUM_FEATURES;
if (ifp->if_capenable & IFCAP_TSO)
ifp->if_hwassist |= EM_TCPSEG_FEATURES;
}
callout_reset(&adapter->timer, hz, em_local_timer, adapter); callout_reset(&adapter->timer, hz, em_local_timer, adapter);
em_clear_hw_cntrs(&adapter->hw); em_clear_hw_cntrs(&adapter->hw);
#ifdef DEVICE_POLLING #ifdef DEVICE_POLLING