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

Prevent kernel panic at ifconfig up after Note PC resume.

Browse Source 
Submitted by: imp, kuriyama
Reviewed by: imp
This commit is contained in:
Yoshinobu Inoue 1999-12-30 18:29:55 +00:00
parent 571b29ee9b
commit 0d0f9d1ed6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=55276
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/net/if.c
View File

@ -36,6 +36,7 @@
#include "opt_compat.h"
#include "opt_inet6.h"
#include "opt_inet.h"
#include <sys/param.h>
#include <sys/malloc.h>
@ -55,9 +56,10 @@
#include <net/radix.h>
#include <net/route.h>
#ifdef INET6
#if defined(INET) || defined(INET6)
/*XXX*/
#include <netinet/in.h>
#include <netinet/in_var.h>
#endif
/*
@ -239,19 +241,36 @@ if_detach(ifp)
for (ifa = TAILQ_FIRST(&ifp->if_addrhead); ifa;
ifa = TAILQ_FIRST(&ifp->if_addrhead)) {
#ifdef INET
/* XXX: Ugly!! ad hoc just for INET */
if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) {
struct ifaliasreq ifr;
bzero(&ifr, sizeof(ifr));
if (ifa->ifa_addr)
ifr.ifra_addr = *ifa->ifa_addr;
ifr.ifra_addr = *ifa->ifa_addr;
if (ifa->ifa_dstaddr)
ifr.ifra_broadaddr = *ifa->ifa_dstaddr;
if (in_control(NULL, SIOCDIFADDR, (caddr_t)&ifr, ifp,
NULL) == 0)
continue;
}
#endif /* INET */
#ifdef INET6
/* XXX: Ugly!! ad hoc just for INET6 */
if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET6) {
struct in6_aliasreq ifr;
bzero(&ifr, sizeof(ifr));
ifr.ifra_addr =
*((struct sockaddr_in6 *)ifa->ifa_addr);
if (ifa->ifa_dstaddr)
ifr.ifra_dstaddr =
*((struct sockaddr_in6 *)ifa->ifa_dstaddr);
if (in6_control(NULL, SIOCDIFADDR_IN6, (caddr_t)&ifr,
ifp, NULL) == 0)
continue;
}
#endif /* INET6 */
TAILQ_REMOVE(&ifp->if_addrhead, ifa, ifa_link);
IFAFREE(ifa);
}