Fix a braino in the last revision, enc_clone_destroy needs return void instead
of int. The clone system will ensure that our first interface is not destroyed so we dont need the extra checking anyway. Tested by: Scott Ullrich
This commit is contained in:
parent
867e6caf17
commit
bac89dcef2
@ -86,27 +86,18 @@ static int enc_ioctl(struct ifnet *, u_long, caddr_t);
|
||||
static int enc_output(struct ifnet *ifp, struct mbuf *m,
|
||||
struct sockaddr *dst, struct rtentry *rt);
|
||||
static int enc_clone_create(struct if_clone *, int);
|
||||
static int enc_clone_destroy(struct ifnet *);
|
||||
static void enc_clone_destroy(struct ifnet *);
|
||||
|
||||
IFC_SIMPLE_DECLARE(enc, 1);
|
||||
|
||||
static int
|
||||
static void
|
||||
enc_clone_destroy(struct ifnet *ifp)
|
||||
{
|
||||
|
||||
mtx_lock(&enc_mtx);
|
||||
/* do not allow enc0 to be destroyed */
|
||||
if (encif == ifp) {
|
||||
mtx_unlock(&enc_mtx);
|
||||
return (EBUSY);
|
||||
}
|
||||
mtx_unlock(&enc_mtx);
|
||||
KASSERT(ifp != encif, ("%s: destroying encif", __func__));
|
||||
|
||||
bpfdetach(ifp);
|
||||
if_detach(ifp);
|
||||
if_free(ifp);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
|
Loading…
Reference in New Issue
Block a user