From owner-svn-src-all@FreeBSD.ORG Fri Mar 22 20:44:18 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0AC6053E; Fri, 22 Mar 2013 20:44:18 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D907A708; Fri, 22 Mar 2013 20:44:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2MKiHbq018961; Fri, 22 Mar 2013 20:44:17 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2MKiHPh018943; Fri, 22 Mar 2013 20:44:17 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201303222044.r2MKiHPh018943@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 22 Mar 2013 20:44:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248621 - head/sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 22 Mar 2013 20:44:18 -0000 Author: glebius Date: Fri Mar 22 20:44:16 2013 New Revision: 248621 URL: http://svnweb.freebsd.org/changeset/base/248621 Log: Remove __FreeBSD_version ifdefs. Modified: head/sys/net/if_arcsubr.c head/sys/net/if_lagg.c head/sys/net/if_lagg.h Modified: head/sys/net/if_arcsubr.c ============================================================================== --- head/sys/net/if_arcsubr.c Fri Mar 22 20:12:25 2013 (r248620) +++ head/sys/net/if_arcsubr.c Fri Mar 22 20:44:16 2013 (r248621) @@ -638,11 +638,7 @@ arc_ifattach(struct ifnet *ifp, u_int8_t ifp->if_resolvemulti = arc_resolvemulti; if (ifp->if_baudrate == 0) ifp->if_baudrate = 2500000; -#if __FreeBSD_version < 500000 - ifa = ifnet_addrs[ifp->if_index - 1]; -#else ifa = ifp->if_addr; -#endif KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__)); sdl = (struct sockaddr_dl *)ifa->ifa_addr; sdl->sdl_type = IFT_ARCNET; Modified: head/sys/net/if_lagg.c ============================================================================== --- head/sys/net/if_lagg.c Fri Mar 22 20:12:25 2013 (r248620) +++ head/sys/net/if_lagg.c Fri Mar 22 20:44:16 2013 (r248621) @@ -219,7 +219,6 @@ static moduledata_t lagg_mod = { DECLARE_MODULE(if_lagg, lagg_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); MODULE_VERSION(if_lagg, 1); -#if __FreeBSD_version >= 800000 /* * This routine is run via an vlan * config EVENT @@ -261,7 +260,6 @@ lagg_unregister_vlan(void *arg, struct i } LAGG_RUNLOCK(sc); } -#endif static int lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params) @@ -330,12 +328,10 @@ lagg_clone_create(struct if_clone *ifc, */ ether_ifattach(ifp, eaddr); -#if __FreeBSD_version >= 800000 sc->vlan_attach = EVENTHANDLER_REGISTER(vlan_config, lagg_register_vlan, sc, EVENTHANDLER_PRI_FIRST); sc->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig, lagg_unregister_vlan, sc, EVENTHANDLER_PRI_FIRST); -#endif /* Insert into the global list of laggs */ mtx_lock(&lagg_list_mtx); @@ -356,10 +352,8 @@ lagg_clone_destroy(struct ifnet *ifp) lagg_stop(sc); ifp->if_flags &= ~IFF_UP; -#if __FreeBSD_version >= 800000 EVENTHANDLER_DEREGISTER(vlan_config, sc->vlan_attach); EVENTHANDLER_DEREGISTER(vlan_unconfig, sc->vlan_detach); -#endif /* Shutdown and remove lagg ports */ while ((lp = SLIST_FIRST(&sc->sc_ports)) != NULL) Modified: head/sys/net/if_lagg.h ============================================================================== --- head/sys/net/if_lagg.h Fri Mar 22 20:12:25 2013 (r248620) +++ head/sys/net/if_lagg.h Fri Mar 22 20:44:16 2013 (r248621) @@ -215,10 +215,8 @@ struct lagg_softc { void (*sc_lladdr)(struct lagg_softc *); void (*sc_req)(struct lagg_softc *, caddr_t); void (*sc_portreq)(struct lagg_port *, caddr_t); -#if __FreeBSD_version >= 800000 eventhandler_tag vlan_attach; eventhandler_tag vlan_detach; -#endif struct sysctl_ctx_list ctx; /* sysctl variables */ int use_flowid; /* use M_FLOWID */ };