Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/net/npf Pull up following revision(s) (requested by p...



details:   https://anonhg.NetBSD.org/src/rev/d1720895b0e1
branches:  netbsd-8
changeset: 434959:d1720895b0e1
user:      martin <martin%NetBSD.org@localhost>
date:      Sat May 05 19:15:55 2018 +0000

description:
Pull up following revision(s) (requested by prlw1 in ticket #795):

        sys/net/npf/npf_nat.c: revision 1.42

PR/53207: David Binderman: Use logical and

diffstat:

 sys/net/npf/npf_nat.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r de18c0b45e9e -r d1720895b0e1 sys/net/npf/npf_nat.c
--- a/sys/net/npf/npf_nat.c     Sat May 05 19:13:21 2018 +0000
+++ b/sys/net/npf/npf_nat.c     Sat May 05 19:15:55 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_nat.c,v 1.41 2016/12/26 23:05:06 christos Exp $    */
+/*     $NetBSD: npf_nat.c,v 1.41.8.1 2018/05/05 19:15:55 martin Exp $  */
 
 /*-
  * Copyright (c) 2014 Mindaugas Rasiukevicius <rmind at netbsd org>
@@ -72,7 +72,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.41 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_nat.c,v 1.41.8.1 2018/05/05 19:15:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -890,7 +890,7 @@
        prop_dictionary_get_uint16(natdict, "tport", &nt->nt_tport);
 
        /* Take a specific port from port-map. */
-       if ((np->n_flags & NPF_NAT_PORTMAP) != 0 && nt->nt_tport &
+       if ((np->n_flags & NPF_NAT_PORTMAP) != 0 && nt->nt_tport &&
            !npf_nat_takeport(np, nt->nt_tport)) {
                pool_cache_put(nat_cache, nt);
                return NULL;



Home | Main Index | Thread Index | Old Index