Date: Thu, 6 Nov 2008 11:11:25 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184718 - head/sys/dev/e1000 Message-ID: <200811061111.mA6BBPgS054102@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Thu Nov 6 11:11:25 2008 New Revision: 184718 URL: http://svn.freebsd.org/changeset/base/184718 Log: Hide AF_INET specific ioctl handling under #ifdef INET. MFC after: 2 months Modified: head/sys/dev/e1000/if_igb.c Modified: head/sys/dev/e1000/if_igb.c ============================================================================== --- head/sys/dev/e1000/if_igb.c Thu Nov 6 11:00:57 2008 (r184717) +++ head/sys/dev/e1000/if_igb.c Thu Nov 6 11:11:25 2008 (r184718) @@ -34,6 +34,7 @@ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" +#include "opt_inet.h" #endif #include <sys/param.h> @@ -802,7 +803,9 @@ igb_ioctl(struct ifnet *ifp, u_long comm { 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) @@ -810,6 +813,7 @@ igb_ioctl(struct ifnet *ifp, u_long comm switch (command) { case SIOCSIFADDR: +#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) { /* * XXX @@ -826,6 +830,7 @@ igb_ioctl(struct ifnet *ifp, u_long comm } arp_ifinit(ifp, ifa); } else +#endif error = ether_ioctl(ifp, command, data); break; case SIOCSIFMTU:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811061111.mA6BBPgS054102>