d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove __FreeBSD_version ifdefs.

Browse Source
This commit is contained in:
glebius 2013-03-22 20:44:16 +00:00
parent b69a01f7fa
commit 82edd7c363
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/if_arcsubr.c
View File

@ -638,11 +638,7 @@ arc_ifattach(struct ifnet *ifp, u_int8_t lla)
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;

6
sys/net/if_lagg.c
View File

@ -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 ifnet *ifp, u_int16_t vtag)
}
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, int unit, caddr_t params)
*/
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)

2
sys/net/if_lagg.h
View File

@ -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 */
};