svn commit: r184717 - head/sys/dev/e1000
Bjoern A. Zeeb
bz at FreeBSD.org
Thu Nov 6 03:00:57 PST 2008
Author: bz
Date: Thu Nov 6 11:00:57 2008
New Revision: 184717
URL: http://svn.freebsd.org/changeset/base/184717
Log:
Hide AF_INET specific ioctl handling under #ifdef INET.
MFC after: 2 months
Modified:
head/sys/dev/e1000/if_em.c
Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c Thu Nov 6 10:53:35 2008 (r184716)
+++ head/sys/dev/e1000/if_em.c Thu Nov 6 11:00:57 2008 (r184717)
@@ -34,6 +34,7 @@
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
+#include "opt_inet.h"
#endif
#include <sys/param.h>
@@ -1033,7 +1034,9 @@ em_ioctl(struct ifnet *ifp, u_long comma
{
struct adapter *adapter = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *)data;
+#ifdef INET
struct ifaddr *ifa = (struct ifaddr *)data;
+#endif
int error = 0;
if (adapter->in_detach)
@@ -1041,6 +1044,7 @@ em_ioctl(struct ifnet *ifp, u_long comma
switch (command) {
case SIOCSIFADDR:
+#ifdef INET
if (ifa->ifa_addr->sa_family == AF_INET) {
/*
* XXX
@@ -1057,6 +1061,7 @@ em_ioctl(struct ifnet *ifp, u_long comma
}
arp_ifinit(ifp, ifa);
} else
+#endif
error = ether_ioctl(ifp, command, data);
break;
case SIOCSIFMTU:
More information about the svn-src-all
mailing list