summaryrefslogtreecommitdiffstats
path: root/sys/contrib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable/10' into develdevelRenato Botelho2017-02-231-4/+4
|\
| * MFC r311950 (by bz):cy2017-02-111-4/+4
| | | | | | | | | | | | | | | | Get rid of a compiler warning which I saw too often. Include netinet/in.h before ip_compat.t which will then check if IPPROTO_IPIP is defined or not. Doing it the other way round, ip_compat.h would not find it defined and netinet/in.h then redefine it.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-10-06334-14535/+23516
|\ \ | |/
| * MFC: r284583, r285797, r285799, r287168, r298714, r298720, r298838,jkim2016-09-30334-14535/+23516
| | | | | | | | | | | | | | | | r300879 Merge ACPICA up to 20160527. Requested by: mav
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-09-125-7/+29
|\ \ | |/
| * MFC r304953:dim2016-08-315-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define ipfilter's SOLARIS macro in a defined and portable way. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D7671 MFC r304959 (by kib): Complete r304953. Sponsored by: The FreeBSD Foundation MFC r304964: Follow-up to r304953, in which I broke the build: apparently the SOLARIS macro is defined in lots of different places in ipfilter, so replace all of the nonportable definitions with portable ones. Pointy hat to: dim
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-06-212-1/+20
|\ \ | |/
| * MFC r300259:cy2016-06-192-1/+20
| | | | | | | | | | | | | | | | | | | | | | Enable the two ip_frag tuneables. The code is there but the two ip_frag tuneables aren't registered in the ipf_tuners linked list. This commmit enables the two existing ip_frag tuneables by registering them. MFC r300260: Remove extraneous blank line.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-05-161-2/+2
|\ \ | |/
| * MFC r298030: Use NULL instead of 0 for pointer comparison.cy2016-05-141-2/+2
| |
* | Merge remote-tracking branch 'origin/stable/10' into develLuiz Otavio O Souza2016-04-1716-9/+1872
|\ \ | |/
| * MFC r287009, r287120 and r298131:loos2016-04-1616-11/+825
| | | | | | | | | | | | | | | | | | | | | | | | | | Add ALTQ(9) support for the CoDel algorithm. CoDel is a parameterless queue discipline that handles variable bandwidth and RTT. It can be used as the single queue discipline on an interface or as a sub discipline of existing queue disciplines such as PRIQ, CBQ, HFSC, FAIRQ. Obtained from: pfSense Sponsored by: Rubicon Communications (Netgate)
| * MFC r284777, r284814, r284863 and r298088:loos2016-04-165-1/+1050
| | | | | | | | | | | | | | | | ALTQ FAIRQ discipline import from DragonFLY. Differential Revision: https://reviews.freebsd.org/D2847 Obtained from: pfSense Sponsored by: Rubicon Communications (Netgate)
* | Revert "MFC r284777:"Luiz Otavio O Souza2016-04-175-1065/+1
| | | | | | | | | | | | This reverts commit c548a571ceaeae698d02b862b4170d015a265ba7. TAG: FAIRQ
* | Revert "MFC r284814:"Luiz Otavio O Souza2016-04-171-4/+19
| | | | | | | | | | | | This reverts commit 69cf34d51f20b467d13ccf4f94f79c4e479b26bc. TAG: FAIRQ
* | Revert "MFC r284863:"Luiz Otavio O Souza2016-04-171-2/+2
| | | | | | | | | | | | This reverts commit 345e414aceb6e896ae280ea4ddd44d1bde6cc349. TAG: FAIRQ
* | Revert "MFC r287009:"Luiz Otavio O Souza2016-04-1716-825/+11
| | | | | | | | | | | | This reverts commit 9622cc803af75551a6623d5d9c5311f1e0af1cb5. TAG: CODEL
* | Revert "MFC r287120:"Luiz Otavio O Souza2016-04-172-2/+2
| | | | | | | | | | | | This reverts commit 9c716f4f2fda10bca9fd54293b2f4fe9de1e9198. TAG: CODEL
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-04-111-0/+1
|\ \ | |/
| * MFC r296934:hselasky2016-04-071-0/+1
| | | | | | | | | | | | | | | | Fix crash in krping when run as a client due to NULL pointer access. Initialize pointer in question which is used only when fast registers mode is selected. Sponsored by: Mellanox Technologies
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-03-171-4/+0
|\ \ | |/
| * MFC r296299 - Remove redundant NULL pointer comparison.cy2016-03-161-4/+0
| | | | | | | | Reported by: PVS-Studio (V595) in Differential Revision D5245
* | Revert "Importing pfSense patches net80211HEAD.tgz and conf.file.ieee80211.diff"Renato Botelho2016-02-2226-31498/+107
| | | | | | | | This reverts commit 6ee75bdd7bf7c20359dd6e38c243586cb062edea.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2016-01-071-1/+1
|\ \ | |/
| * MFC r292813.cy2015-12-311-1/+1
| | | | | | | | Correct __FreeBSD__ check.
* | Merge remote-tracking branch 'origin/stable/10' into develRenato Botelho2015-12-281-2/+2
|\ \ | |/
| * MFC r292518.cy2015-12-271-2/+2
| | | | | | | | | | | | | | Don't assume checksums will be calculated later when fastfoward is enabled (by default in r290383). PR: 72210
* | MFC r287120:Luiz Otavio O Souza2015-11-112-2/+2
| | | | | | | | | | | | | | | | | | Fix the spelling of eri's name. Pointy hat to: loos MFC with: r287009 TAG: CODEL
* | MFC r287009:Luiz Otavio O Souza2015-11-1116-11/+825
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ALTQ(9) support for the CoDel algorithm. CoDel is a parameterless queue discipline that handles variable bandwidth and RTT. It can be used as the single queue discipline on an interface or as a sub discipline of existing queue disciplines such as PRIQ, CBQ, HFSC, FAIRQ. Differential Revision: https://reviews.freebsd.org/D3272 Reviewd by: rpaulo, gnn (previous version) Obtained from: pfSense Sponsored by: Rubicon Communications (Netgate) TAG: CODEL
* | MFC r284863:Luiz Otavio O Souza2015-11-111-2/+2
| | | | | | | | | | | | Another attempt to make this compile on more architectures after r284777. TAG: FAIRQ
* | MFC r284814:Luiz Otavio O Souza2015-11-111-19/+4
| | | | | | | | | | | | | | | | Correct r284777 to use proper includes and remove dead code to unbreak kernel builds. Differential Revision: https://reviews.freebsd.org/D2847 TAG: FAIRQ
* | MFC r284777:Luiz Otavio O Souza2015-11-115-1/+1065
| | | | | | | | | | | | | | | | | | | | | | | | ALTQ FAIRQ discipline import from DragonFLY Differential Revision: https://reviews.freebsd.org/D2847 Reviewed by: glebius, wblock(manpage) Approved by: gnn(mentor) Obtained from: pfSense Sponsored by: Netgate TAG: FAIRQ
* | Revert "Importing pfSense patch fairq.RELENG_10.diff"Luiz Otavio O Souza2015-11-115-1080/+1
| | | | | | | | | | | | This reverts commit 570dae5561e54cd2703f546b04a3fa029c92dc62. TAG: FAIRQ
* | Revert "Importing pfSense patch altq_codel.diff"Luiz Otavio O Souza2015-11-1116-737/+11
| | | | | | | | | | | | This reverts commit cf3bb1a7166bec431631defe01c8d4e706a99638. TAG: CODEL
* | Merge branch 'stable/10' into develRenato Botelho2015-10-211-2/+1
|\ \ | |/
| * MFC r289480. Really fix ipfilter bug 3600459.cy2015-10-201-2/+1
| | | | | | | | Obtained from: ipfilter cvs repo r1.48.2.25, r1.72 and NetBSD repo r1.4
* | Merge branch 'stable/10' into develRenato Botelho2015-10-131-0/+16
|\ \ | |/
| * MFC r288910: On some interfaces, ipfilter drops UDP packets with zerocy2015-10-131-0/+16
| | | | | | | | | | | | | | | | checkum. This commit fixes that. PR: 166372 Submitted by: mk@neon1.net Reviewed by: Darren Reed <darrenr@reed.wattle.id.au>
* | Merge branch 'stable/10' into develRenato Botelho2015-10-071-1/+2
|\ \ | |/
| * MFC r287674, r287675. Fix ipfilter bug 3600459 NAT bucket count wrong.cy2015-09-261-1/+2
| | | | | | | | Obtained from: ipfilter cvs repo r1.48.2.25
* | Merge branch 'stable/10' into develRenato Botelho2015-09-221-6/+10
|\ \ | |/
| * MFC r287651, r287652, r287653.cy2015-09-191-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mutex errors, fixup typos in comments. Obtained from: NetBSD r1.4. -This lie, anr those below, will be ignored-- > Description of fields to fill in above: 76 columns --| > PR: If a GNATS PR is affected by the change. > Submitted by: If someone else sent in the change. > Reviewed by: If someone else reviewed your modification. > Approved by: If you needed approval for this commit. > Obtained from: If the change is from a third party. > MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. > MFH: Ports tree branch name. Request approval for merge. > Relnotes: Set to 'yes' for mention in release notes. > Security: Vulnerability reference (one per line) or description. > Sponsored by: If the change was sponsored by an organization. > Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed). > Empty fields above will be automatically removed. _M . M sys/contrib/ipfilter/netinet/ip_state.c
* | Importing pfSense patches net80211HEAD.tgz and conf.file.ieee80211.diffRenato Botelho2015-08-1726-107/+31498
| |
* | Importing pfSense patch altq_codel.diffRenato Botelho2015-08-1716-11/+737
| |
* | Importing pfSense patch fairq.RELENG_10.diffRenato Botelho2015-08-175-1/+1080
| |
* | Importing pfSense patch altq_max_queues.diffRenato Botelho2015-08-172-2/+2
|/
* MFC: r283092, r283966jkim2015-06-1655-429/+3823
| | | | | | Merge ACPICA 20150515. Relnotes: yes
* MFC r281502:delphij2015-04-271-2/+2
| | | | Sync with OpenBSD: Use volatile instead of __volatile__.
* MFC: r281396, r281475jkim2015-04-1878-1118/+1488
| | | | | | Merge ACPICA 20150410. Relnotes: yes
* MFC r272444 (by jkim):dim2015-04-04316-7520/+22338
| | | | | | | | | | | Merge ACPICA 20140926. MFC r278970 (by jkim): Merge ACPICA 20141107 and 20150204. Approved by: jkim Relnotes: yes
OpenPOWER on IntegriCloud