From: Rui Paulo Date: Wed, 14 Apr 2010 11:38:03 +0000 (+0100) Subject: Update to new if_clone API. X-Git-Tag: v2.7.1~34^2~1 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d14ef41ea33cca165244a8d9da450301440d7470 Update to new if_clone API. --- diff --git a/sys/net/bridge/if_bridge.c b/sys/net/bridge/if_bridge.c index 6cd2fa1e60..a3e4e7104b 100644 --- a/sys/net/bridge/if_bridge.c +++ b/sys/net/bridge/if_bridge.c @@ -359,7 +359,7 @@ extern void (*bridge_dn_p)(struct mbuf *, struct ifnet *); static int bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD; -static int bridge_clone_create(struct if_clone *, int); +static int bridge_clone_create(struct if_clone *, int, caddr_t); static void bridge_clone_destroy(struct ifnet *); static int bridge_ioctl(struct ifnet *, u_long, caddr_t, struct ucred *); @@ -631,7 +631,7 @@ DECLARE_MODULE(if_bridge, bridge_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); * Create a new bridge instance. */ static int -bridge_clone_create(struct if_clone *ifc, int unit) +bridge_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) { struct bridge_softc *sc; struct ifnet *ifp; diff --git a/sys/net/faith/if_faith.c b/sys/net/faith/if_faith.c index 534861a1fa..8663d17cd3 100644 --- a/sys/net/faith/if_faith.c +++ b/sys/net/faith/if_faith.c @@ -156,7 +156,7 @@ DECLARE_MODULE(if_faith, faith_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); MODULE_VERSION(if_faith, 1); int -faith_clone_create(struct if_clone *ifc, int unit, caddr_t param) +faith_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) { struct faith_softc *sc; diff --git a/sys/net/gre/if_gre.c b/sys/net/gre/if_gre.c index 99c5f35fa2..8143671856 100644 --- a/sys/net/gre/if_gre.c +++ b/sys/net/gre/if_gre.c @@ -101,7 +101,7 @@ static MALLOC_DEFINE(M_GRE, GRENAME, "Generic Routing Encapsulation"); struct gre_softc_head gre_softc_list; -static int gre_clone_create(struct if_clone *, int); +static int gre_clone_create(struct if_clone *, int, caddr_t); static void gre_clone_destroy(struct ifnet *); static int gre_ioctl(struct ifnet *, u_long, caddr_t, struct ucred *); static int gre_output(struct ifnet *, struct mbuf *, struct sockaddr *, @@ -160,7 +160,7 @@ greattach(void) } static int -gre_clone_create(struct if_clone *ifc, int unit) +gre_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) { struct gre_softc *sc; diff --git a/sys/net/pf/if_pflog.c b/sys/net/pf/if_pflog.c index c35a7ca4ed..1ed7bbe13f 100644 --- a/sys/net/pf/if_pflog.c +++ b/sys/net/pf/if_pflog.c @@ -87,7 +87,7 @@ static void pflog_clone_destroy(struct ifnet *); -static int pflog_clone_create(struct if_clone *, int); +static int pflog_clone_create(struct if_clone *, int, caddr_t); int pflogoutput(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); int pflogioctl(struct ifnet *, u_long, caddr_t, struct ucred *); @@ -118,7 +118,7 @@ pflog_clone_destroy(struct ifnet *ifp) } static int -pflog_clone_create(struct if_clone *ifc, int unit) +pflog_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) { struct pflog_softc *sc; diff --git a/sys/net/pf/if_pfsync.c b/sys/net/pf/if_pfsync.c index fd78d23ae0..17a4790334 100644 --- a/sys/net/pf/if_pfsync.c +++ b/sys/net/pf/if_pfsync.c @@ -88,7 +88,7 @@ int pfsync_sync_ok; struct pfsyncstats pfsyncstats; static void pfsync_clone_destroy(struct ifnet *); -static int pfsync_clone_create(struct if_clone *, int); +static int pfsync_clone_create(struct if_clone *, int, caddr_t); void pfsync_setmtu(struct pfsync_softc *, int); int pfsync_insert_net_state(struct pfsync_state *); int pfsyncoutput(struct ifnet *, struct mbuf *, struct sockaddr *, @@ -126,7 +126,7 @@ pfsync_clone_destroy(struct ifnet *ifp) } static int -pfsync_clone_create(struct if_clone *ifc, int unit) +pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) { struct pfsync_softc *sc; struct ifnet *ifp; diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c index 2010b01cb5..062d52e1c3 100644 --- a/sys/net/tap/if_tap.c +++ b/sys/net/tap/if_tap.c @@ -98,7 +98,7 @@ static struct tap_softc *tapcreate(int, cdev_t); static void tapdestroy(struct tap_softc *); /* clone */ -static int tap_clone_create(struct if_clone *, int); +static int tap_clone_create(struct if_clone *, int, caddr_t); static void tap_clone_destroy(struct ifnet *); @@ -283,7 +283,8 @@ tapfind(int unit) * Create a new tap instance via ifconfig. */ static int -tap_clone_create(struct if_clone *ifc __unused, int unit) +tap_clone_create(struct if_clone *ifc __unused, int unit, + caddr_t param __unused) { struct tap_softc *tp; cdev_t dev; diff --git a/sys/net/vlan/if_vlan.c b/sys/net/vlan/if_vlan.c index 6355d88f15..4fff5b0339 100644 --- a/sys/net/vlan/if_vlan.c +++ b/sys/net/vlan/if_vlan.c @@ -127,7 +127,7 @@ SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0, "for consistency"); static MALLOC_DEFINE(M_VLAN, "vlan", "802.1Q Virtual LAN Interface"); static LIST_HEAD(, ifvlan) ifv_list; -static int vlan_clone_create(struct if_clone *, int); +static int vlan_clone_create(struct if_clone *, int, caddr_t); static void vlan_clone_destroy(struct ifnet *); static void vlan_ifdetach(void *, struct ifnet *); @@ -381,7 +381,7 @@ vlan_ifdetach(void *arg __unused, struct ifnet *ifp) } static int -vlan_clone_create(struct if_clone *ifc, int unit) +vlan_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) { struct ifvlan *ifv; struct ifnet *ifp; diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 990eae6bf8..46a55bebc5 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -179,7 +179,7 @@ static int carp_hmac_verify(struct carp_softc *, uint32_t *, unsigned char *); static void carp_setroute(struct carp_softc *, int); static void carp_input_c(struct mbuf *, struct carp_header *, sa_family_t); -static int carp_clone_create(struct if_clone *, int); +static int carp_clone_create(struct if_clone *, int, caddr_t); static void carp_clone_destroy(struct ifnet *); static void carp_detach(struct carp_softc *, int); static int carp_prepare_ad(struct mbuf *, struct carp_softc *, @@ -375,7 +375,7 @@ carp_setroute(struct carp_softc *sc, int cmd) } static int -carp_clone_create(struct if_clone *ifc, int unit) +carp_clone_create(struct if_clone *ifc, int unit, caddr_t param __unused) { struct carp_softc *sc; struct ifnet *ifp;