diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-08-04 14:25:25 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-08-04 14:25:25 +0000 |
| commit | 237f09610d31e6aab8bb7598080f081cad6c2eaa (patch) | |
| tree | beb7e5f80cd0371fb73f08025f4f9527e84dd2e6 /sys/dev/pci/if_em.h | |
| parent | cb8596e5bd5ef2ea2c011bb81cc32c19dabf58f7 (diff) | |
- merge em/ixgb_disable_promisc() into em/ixgb_set_promisc().
- rearrange interface flags ioctl handler.
Diffstat (limited to 'sys/dev/pci/if_em.h')
| -rw-r--r-- | sys/dev/pci/if_em.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h index af01b8a70c3..de249735763 100644 --- a/sys/dev/pci/if_em.h +++ b/sys/dev/pci/if_em.h @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /* $FreeBSD: if_em.h,v 1.26 2004/09/01 23:22:41 pdeuskar Exp $ */ -/* $OpenBSD: if_em.h,v 1.26 2006/07/07 02:56:18 brad Exp $ */ +/* $OpenBSD: if_em.h,v 1.27 2006/08/04 14:25:24 brad Exp $ */ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -306,6 +306,7 @@ struct em_softc { struct timeout em_intr_enable; struct timeout timer_handle; struct timeout tx_fifo_timer_handle; + int if_flags; void *sc_powerhook; void *sc_shutdownhook; |