diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-05-24 04:01:49 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-05-24 04:01:49 +0000 |
| commit | 9c90494417e1c9ff04ef2f97655fb44d491b56fe (patch) | |
| tree | 7a4dfdde9442fa26e85d5266f9e3ea1dcdfb8a75 /sys/contrib/ipfilter/netinet/ip_nat.c | |
| parent | 3a99aee60f0a28e131e1ae80b6da2da06700a956 (diff) | |
| download | FreeBSD-src-9c90494417e1c9ff04ef2f97655fb44d491b56fe.zip FreeBSD-src-9c90494417e1c9ff04ef2f97655fb44d491b56fe.tar.gz | |
fix conflicts
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_nat.c')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_nat.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c index f0d622f..131f599 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.c +++ b/sys/contrib/ipfilter/netinet/ip_nat.c @@ -2250,15 +2250,6 @@ void *ifp; nat->nat_sumd[1] = nat->nat_sumd[0]; } -<<<<<<< ip_nat.c - for (n = nat_list; (n != NULL); n = n->in_next) - if (n->in_ifp == ifp) { - n->in_ifp = (void *)GETUNIT(n->in_ifname); - if (!n->in_ifp) - n->in_ifp = (void *)-1; - } - RWLOCK_EXIT(&ipf_nat); -======= for (n = nat_list; (n != NULL); n = n->in_next) if (n->in_ifp == ifp) { n->in_ifp = (void *)GETUNIT(n->in_ifname, 4); @@ -2266,7 +2257,6 @@ void *ifp; n->in_ifp = (void *)-1; } RWLOCK_EXIT(&ipf_nat); ->>>>>>> 1.1.1.8 SPL_X(s); } |
