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

MFC 1.107:

Browse Source 
Fix two important typos in watchdog handling:
  - Restart watchdog if we *did* processed any descriptors. [1]
  - Log the watchdog event if the link is *up*. [2]

  PR:		kern/92948 [1]
  Submitted by:	Mihail Balikov <mihail.balikov interbgc.com> [1]
  PR:		kern/92895 [2]
  Submitted by:	Vladimir Ivanov <wawa yandex-team.ru> [2]

Approved by:	re (kensmith)
This commit is contained in:
glebius 2006-02-16 12:45:12 +00:00
parent 7fb01282ec
commit 2656c27599
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -873,7 +873,7 @@ em_watchdog(struct ifnet *ifp)
return;
}
if (em_check_for_link(&adapter->hw))
if (!em_check_for_link(&adapter->hw))
printf("em%d: watchdog timeout -- resetting\n", adapter->unit);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
@ -2603,7 +2603,7 @@ em_clean_transmit_interrupts(struct adapter * adapter)
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
if (num_avail == adapter->num_tx_desc)
ifp->if_timer = 0;
else if (num_avail == adapter->num_tx_desc_avail)
else if (num_avail != adapter->num_tx_desc_avail)
ifp->if_timer = EM_TX_TIMEOUT;
}
adapter->num_tx_desc_avail = num_avail;