diff options
| author | Renato Botelho <renato@netgate.com> | 2017-04-27 10:47:32 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-04-27 10:47:32 -0300 |
| commit | bbfdb9a1d32f8fbc853e0422c9916f660f048893 (patch) | |
| tree | dfd1421b8b595f47b058342371efedabcfc03347 /sys | |
| parent | 07324460536d4fea98778edbb99e88f512dd3a6c (diff) | |
| parent | c566b99bac77a9a14c76bf2c175ea4985cb30ffe (diff) | |
| download | FreeBSD-src-bbfdb9a1d32f8fbc853e0422c9916f660f048893.zip FreeBSD-src-bbfdb9a1d32f8fbc853e0422c9916f660f048893.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_frag.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a67acf9..88c6932 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="RELEASE-p18" +BRANCH="RELEASE-p19" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c index 7e3457a..10dee09 100644 --- a/sys/contrib/ipfilter/netinet/ip_frag.c +++ b/sys/contrib/ipfilter/netinet/ip_frag.c @@ -456,7 +456,7 @@ ipfr_frag_new(softc, softf, fin, pass, table IPFR_CMPSZ)) { RWLOCK_EXIT(lock); FBUMPD(ifs_exists); - KFREE(fra); + KFREE(fran); return NULL; } |
