diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2005-08-18 18:36:53 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2005-08-18 18:36:53 +0000 |
| commit | fd5cc4ac2f8f60c6beec30e3a73c83d33b071d11 (patch) | |
| tree | e76422aa641d21577ce70fde53b77a533ce29505 | |
| parent | 58e16c22e8db0eedc3dc3cc79720d253a94c60ef (diff) | |
Notes
| -rw-r--r-- | sys/net/if.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index fb7d09dac5f3..29bb5fe68ea0 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1293,7 +1293,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td) } else if (ifp->if_pcount == 0) { ifp->if_flags &= ~IFF_PROMISC; } - if (ifp->if_ioctl) { + if (ifp->if_ioctl != NULL) { IFF_LOCKGIANT(ifp); (void) (*ifp->if_ioctl)(ifp, cmd, data); IFF_UNLOCKGIANT(ifp); @@ -1834,11 +1834,11 @@ if_addmulti(struct ifnet *ifp, struct sockaddr *sa, struct ifmultiaddr **retifma * find out which AF_LINK address this maps to, if it isn't one * already. */ - if (ifp->if_resolvemulti) { + if (ifp->if_resolvemulti != NULL) { error = ifp->if_resolvemulti(ifp, &llsa, sa); if (error) return error; } else { - llsa = 0; + llsa = NULL; } MALLOC(ifma, struct ifmultiaddr *, sizeof *ifma, M_IFMADDR, M_WAITOK); @@ -1862,7 +1862,7 @@ if_addmulti(struct ifnet *ifp, struct sockaddr *sa, struct ifmultiaddr **retifma if (retifma != NULL) *retifma = ifma; - if (llsa != 0) { + if (llsa != NULL) { TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (sa_equal(ifma->ifma_addr, llsa)) break; @@ -1911,7 +1911,7 @@ if_delmulti(struct ifnet *ifp, struct sockaddr *sa) TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) if (sa_equal(sa, ifma->ifma_addr)) break; - if (ifma == 0) + if (ifma == NULL) return ENOENT; if (ifma->ifma_refcount > 1) { @@ -1935,7 +1935,7 @@ if_delmulti(struct ifnet *ifp, struct sockaddr *sa) splx(s); free(ifma->ifma_addr, M_IFMADDR); free(ifma, M_IFMADDR); - if (sa == 0) + if (sa == NULL) return 0; /* @@ -1952,7 +1952,7 @@ if_delmulti(struct ifnet *ifp, struct sockaddr *sa) TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) if (sa_equal(sa, ifma->ifma_addr)) break; - if (ifma == 0) + if (ifma == NULL) return 0; if (ifma->ifma_refcount > 1) { |