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

Make failure of ifpromisc() a non-fatal error. This makes it possible to

Browse Source 
run carp(4) on vtnet(4).

Sponsored by:	Nginx, Inc.
This commit is contained in:
Gleb Smirnoff 2014-01-03 11:03:12 +00:00
parent 93b3fdba4a
commit 0cc726f25a
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/netinet/ip_carp.c
View File

@ -145,6 +145,8 @@ struct carp_if {
#endif
struct ifnet *cif_ifp;
struct mtx cif_mtx;
uint32_t cif_flags;
#define CIF_PROMISC 0x00000001
};
#define CARP_INET 0
@ -1483,11 +1485,8 @@ carp_alloc(struct ifnet *ifp)
struct carp_softc *sc;
struct carp_if *cif;
if ((cif = ifp->if_carp) == NULL) {
if ((cif = ifp->if_carp) == NULL)
cif = carp_alloc_if(ifp);
if (cif == NULL)
return (NULL);
}
sc = malloc(sizeof(*sc), M_CARP, M_WAITOK|M_ZERO);
@ -1572,11 +1571,15 @@ static struct carp_if*
carp_alloc_if(struct ifnet *ifp)
{
struct carp_if *cif;
int error;
cif = malloc(sizeof(*cif), M_CARP, M_WAITOK|M_ZERO);
if (ifpromisc(ifp, 1) != 0)
goto cleanup;
if ((error = ifpromisc(ifp, 1)) != 0)
printf("%s: ifpromisc(%s) failed: %d\n",
__func__, ifp->if_xname, error);
else
cif->cif_flags |= CIF_PROMISC;
CIF_LOCK_INIT(cif);
cif->cif_ifp = ifp;
@ -1588,11 +1591,6 @@ carp_alloc_if(struct ifnet *ifp)
IF_ADDR_WUNLOCK(ifp);
return (cif);
cleanup:
free(cif, M_CARP);
return (NULL);
}
static void
@ -1610,7 +1608,8 @@ carp_free_if(struct carp_if *cif)
CIF_LOCK_DESTROY(cif);
ifpromisc(ifp, 0);
if (cif->cif_flags & CIF_PROMISC)
ifpromisc(ifp, 0);
if_rele(ifp);
free(cif, M_CARP);
@ -1683,11 +1682,6 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct thread *td)
}
if (sc == NULL) {
sc = carp_alloc(ifp);
if (sc == NULL) {
error = EINVAL; /* XXX: ifpromisc failed */
break;
}
CARP_LOCK(sc);
sc->sc_vhid = carpr.carpr_vhid;
LLADDR(&sc->sc_addr)[0] = 0;