Duplicate nested if statement in PIM code (from the OpenBSD tree)
This commit is contained in:
parent
3eeb49f1f2
commit
5ff6d3d572
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: ip_mroute.c,v 1.86 2004/09/04 23:30:07 manu Exp $ */
|
/* $NetBSD: ip_mroute.c,v 1.87 2005/01/15 06:50:47 manu Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1992, 1993
|
* Copyright (c) 1992, 1993
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.86 2004/09/04 23:30:07 manu Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.87 2005/01/15 06:50:47 manu Exp $");
|
||||||
|
|
||||||
#include "opt_inet.h"
|
#include "opt_inet.h"
|
||||||
#include "opt_ipsec.h"
|
#include "opt_ipsec.h"
|
||||||
|
@ -1066,8 +1066,7 @@ reset_vif(vifp)
|
||||||
}
|
}
|
||||||
} else if (vifp->v_flags & VIFF_REGISTER) {
|
} else if (vifp->v_flags & VIFF_REGISTER) {
|
||||||
#ifdef PIM
|
#ifdef PIM
|
||||||
if (vifp->v_flags & VIFF_REGISTER)
|
reg_vif_num = VIFI_INVALID;
|
||||||
reg_vif_num = VIFI_INVALID;
|
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
satosin(&ifr.ifr_addr)->sin_len = sizeof(struct sockaddr_in);
|
satosin(&ifr.ifr_addr)->sin_len = sizeof(struct sockaddr_in);
|
||||||
|
|
Loading…
Reference in New Issue