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

Remove the unused if_free_type() function.

Browse Source 
X-MFC after:	never
This commit is contained in:
brooks 2011-12-09 23:26:28 +00:00
parent 0a8d9e8328
commit 9029bb4f3b
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/net/if.c
View File

@ -494,19 +494,12 @@ if_free_internal(struct ifnet *ifp)
}
/*
* This version should only be called by intefaces that switch their type
* after calling if_alloc(). if_free_type() will go away again now that we
* have if_alloctype to cache the original allocation type. For now, assert
* that they match, since we require that in practice.
* Deregister an interface and free the associated storage.
*/
void
if_free_type(struct ifnet *ifp, u_char type)
if_free(struct ifnet *ifp)
{
KASSERT(ifp->if_alloctype == type,
("if_free_type: type (%d) != alloctype (%d)", type,
ifp->if_alloctype));
ifp->if_flags |= IFF_DYING; /* XXX: Locking */
IFNET_WLOCK();
@ -521,18 +514,6 @@ if_free_type(struct ifnet *ifp, u_char type)
if_free_internal(ifp);
}
/*
* This is the normal version of if_free(), used by device drivers to free a
* detached network interface. The contents of if_free_type() will move into
* here when if_free_type() goes away.
*/
void
if_free(struct ifnet *ifp)
{
if_free_type(ifp, ifp->if_alloctype);
}
/*
* Interfaces to keep an ifnet type-stable despite the possibility of the
* driver calling if_free(). If there are additional references, we defer

1
sys/net/if_var.h
View File

@ -865,7 +865,6 @@ void if_down(struct ifnet *);
struct ifmultiaddr *
if_findmulti(struct ifnet *, struct sockaddr *);
void if_free(struct ifnet *);
void if_free_type(struct ifnet *, u_char);
void if_initname(struct ifnet *, const char *, int);
void if_link_state_change(struct ifnet *, int);
int if_printf(struct ifnet *, const char *, ...) __printflike(2, 3);