| if_nfe.c (221407) | if_nfe.c (222542) |
|---|---|
| 1/* $OpenBSD: if_nfe.c,v 1.54 2006/04/07 12:38:12 jsg Exp $ */ 2 3/*- 4 * Copyright (c) 2006 Shigeaki Tagashira <shigeaki@se.hiroshima-u.ac.jp> 5 * Copyright (c) 2006 Damien Bergamini <damien.bergamini@free.fr> 6 * Copyright (c) 2005, 2006 Jonathan Gray <jsg@openbsd.org> 7 * 8 * Permission to use, copy, modify, and distribute this software for any --- 7 unchanged lines hidden (view full) --- 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 */ 20 21/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ 22 23#include <sys/cdefs.h> | 1/* $OpenBSD: if_nfe.c,v 1.54 2006/04/07 12:38:12 jsg Exp $ */ 2 3/*- 4 * Copyright (c) 2006 Shigeaki Tagashira <shigeaki@se.hiroshima-u.ac.jp> 5 * Copyright (c) 2006 Damien Bergamini <damien.bergamini@free.fr> 6 * Copyright (c) 2005, 2006 Jonathan Gray <jsg@openbsd.org> 7 * 8 * Permission to use, copy, modify, and distribute this software for any --- 7 unchanged lines hidden (view full) --- 16 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 17 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 */ 20 21/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ 22 23#include <sys/cdefs.h> |
| 24__FBSDID("$FreeBSD: head/sys/dev/nfe/if_nfe.c 221407 2011-05-03 19:51:29Z marius $"); | 24__FBSDID("$FreeBSD: head/sys/dev/nfe/if_nfe.c 222542 2011-05-31 18:45:15Z yongari $"); |
| 25 26#ifdef HAVE_KERNEL_OPTION_HEADERS 27#include "opt_device_polling.h" 28#endif 29 30#include <sys/param.h> 31#include <sys/endian.h> 32#include <sys/systm.h> --- 1851 unchanged lines hidden (view full) --- 1884 if (r & NFE_IRQ_LINK) { 1885 NFE_READ(sc, NFE_PHY_STATUS); 1886 NFE_WRITE(sc, NFE_PHY_STATUS, 0xf); 1887 DPRINTF(sc, "link state changed\n"); 1888 } 1889 1890 if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { 1891 NFE_UNLOCK(sc); | 25 26#ifdef HAVE_KERNEL_OPTION_HEADERS 27#include "opt_device_polling.h" 28#endif 29 30#include <sys/param.h> 31#include <sys/endian.h> 32#include <sys/systm.h> --- 1851 unchanged lines hidden (view full) --- 1884 if (r & NFE_IRQ_LINK) { 1885 NFE_READ(sc, NFE_PHY_STATUS); 1886 NFE_WRITE(sc, NFE_PHY_STATUS, 0xf); 1887 DPRINTF(sc, "link state changed\n"); 1888 } 1889 1890 if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { 1891 NFE_UNLOCK(sc); |
| 1892 nfe_enable_intr(sc); | 1892 nfe_disable_intr(sc); |
| 1893 return; 1894 } 1895 1896 domore = 0; 1897 /* check Rx ring */ 1898 if (sc->nfe_framesize > MCLBYTES - ETHER_HDR_LEN) 1899 domore = nfe_jrxeof(sc, sc->nfe_process_limit, NULL); 1900 else --- 1478 unchanged lines hidden --- | 1893 return; 1894 } 1895 1896 domore = 0; 1897 /* check Rx ring */ 1898 if (sc->nfe_framesize > MCLBYTES - ETHER_HDR_LEN) 1899 domore = nfe_jrxeof(sc, sc->nfe_process_limit, NULL); 1900 else --- 1478 unchanged lines hidden --- |