diff options
author | jfv <jfv@FreeBSD.org> | 2013-07-12 22:36:26 +0000 |
---|---|---|
committer | jfv <jfv@FreeBSD.org> | 2013-07-12 22:36:26 +0000 |
commit | 634e1583d3b76eff927332ced54509365b20ff53 (patch) | |
tree | 1ecc87a9a3aeb69afa909c0d9efabaea4ef4bc05 /sys/dev/e1000/if_em.c | |
parent | 851ca387c5ade2c32eeb8585f5e8a796bcccfc0b (diff) | |
download | FreeBSD-src-634e1583d3b76eff927332ced54509365b20ff53.zip FreeBSD-src-634e1583d3b76eff927332ced54509365b20ff53.tar.gz |
Change the E1000 driver option header handling to match the
ixgbe driver. As it was, when building them as a module INET
and INET6 are not defined. In these drivers it does not cause
a panic, however it does result in different behavior in the
ioctl routine when you are using a module vs static, and I
think the behavior should be the same.
MFC after: 3 days
Diffstat (limited to 'sys/dev/e1000/if_em.c')
-rw-r--r-- | sys/dev/e1000/if_em.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 2ca4d3e..140fc77 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -32,10 +32,11 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifdef HAVE_KERNEL_OPTION_HEADERS -#include "opt_device_polling.h" #include "opt_inet.h" #include "opt_inet6.h" + +#ifdef HAVE_KERNEL_OPTION_HEADERS +#include "opt_device_polling.h" #endif #include <sys/param.h> |