Module Name: src Committed By: msaitoh Date: Thu Feb 25 15:07:06 UTC 2010
Modified Files: src/sys/dev/pci: if_wm.c if_wmvar.h Log Message: Merge if_wm.c rev. 1.162.4.13 and if_wmvar.h rev. 1.2.46.3 into maintrunk. Increase the timeout value to prevent timeout on 80003. The values are taken from Intel's e1000 driver. Tested by spz and me. To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_wmvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.