From owner-svn-src-all@FreeBSD.ORG Thu Nov 6 10:17:58 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 271EB106567C; Thu, 6 Nov 2008 10:17:58 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 161438FC19; Thu, 6 Nov 2008 10:17:58 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA6AHvtO051811; Thu, 6 Nov 2008 10:17:57 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA6AHv91051810; Thu, 6 Nov 2008 10:17:57 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200811061017.mA6AHv91051810@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Thu, 6 Nov 2008 10:17:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184714 - head/sys/dev/cxgb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Nov 2008 10:17:58 -0000 Author: bz Date: Thu Nov 6 10:17:57 2008 New Revision: 184714 URL: http://svn.freebsd.org/changeset/base/184714 Log: Hide AF_INET specific ioctl handling under #ifdef INET. Reviewed by: kmacy MFC after: 2 months Modified: head/sys/dev/cxgb/cxgb_main.c Modified: head/sys/dev/cxgb/cxgb_main.c ============================================================================== --- head/sys/dev/cxgb/cxgb_main.c Thu Nov 6 09:59:57 2008 (r184713) +++ head/sys/dev/cxgb/cxgb_main.c Thu Nov 6 10:17:57 2008 (r184714) @@ -1931,7 +1931,9 @@ static int cxgb_ioctl(struct ifnet *ifp, unsigned long command, caddr_t data) { struct port_info *p = ifp->if_softc; +#ifdef INET struct ifaddr *ifa = (struct ifaddr *)data; +#endif struct ifreq *ifr = (struct ifreq *)data; int flags, error = 0, reinit = 0; uint32_t mask; @@ -1944,6 +1946,7 @@ cxgb_ioctl(struct ifnet *ifp, unsigned l error = cxgb_set_mtu(p, ifr->ifr_mtu); break; case SIOCSIFADDR: +#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) { ifp->if_flags |= IFF_UP; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { @@ -1953,6 +1956,7 @@ cxgb_ioctl(struct ifnet *ifp, unsigned l } arp_ifinit(ifp, ifa); } else +#endif error = ether_ioctl(ifp, command, data); break; case SIOCSIFFLAGS: