summaryrefslogtreecommitdiffstats
path: root/sys/contrib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3Renato Botelho2017-04-271-1/+1
|\
| * Fix ipfilter(4) fragment handling panic.delphij2017-04-271-1/+1
| | | | | | | | | | Security: FreeBSD-SA-17:04.ipfilter Approved by: so
* | 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
* MFC r278551:kevlo2015-02-222-443/+443
| | | | | Add preliminary support for the Ralink RT5390 and RT5392 chipsets. Committed over the D-Link DWA-525 rev A2 on amd64 with WPA.
* MFC r278348:dim2015-02-101-2/+2
| | | | | | | | | Fix a number of -Wcast-qual warnings in ath's ar9300_attach.c, by making the ia_array field of struct ar9300_ini_array const, and removing the const-dropping casts. No functional change. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D1725
* MFC r275199.cy2014-12-102-2/+2
| | | | Correctly define constants.
* MFC r275003:kevlo2014-12-011-4/+8
| | | | Add missing headers needed by write().
* MFC r274744.cy2014-11-281-0/+11
| | | | | | | | | | | | | | | | Set the current vnet inside the ioctl handler for ipfilter. Without this fix, the vnet was NULL and would crash. This fix is similar to what was done inside the ioctl handler for PF. Tested by: (1) Boot a kernel with "options VIMAGE" enabled (2) Type: echo "map lo0 from 10.0.0.0/24 to ! 10.0.0.0/24 -> 127.0.0.1/32" > /etc/ipnat.rules ; service ipnat onerestart PR: 176992 Differential Revision: https://reviews.freebsd.org/D1191
* MFC r262606, r262607, r262608, r262609, r262610, r269528, r269609, r271133:ian2014-10-2676-10883/+0
| | | | | | | | - Move imported dts source from sys/contrib/dts/ to sys/gnu/dts. - Fix some missing properties. - Import dts-related header files. - Update everything to latest vendor branch representing 3.17-rc2 level of Linux DTS API.
* MFC r273135:hselasky2014-10-181-1/+0
| | | | | | | | | | | | | | | | | Update the OFED Linux compatibility layer and Mellanox hardware driver(s): - Properly name an inclusion guard - Fix compile warnings regarding unsigned enums - Add two new sysctl nodes - Remove all empty linux header files - Make an error printout more verbose - Use "mod_delayed_work()" instead of cancelling and starting a timeout. - Implement more Linux scatterlist functions. Sponsored by: Mellanox Technologies
* MFC r272555cy2014-10-121-2/+4
| | | | | | | | ipfilter bug #537 NAT rules with sticky have incorrect hostmap IP address. This fixes when an IP address mapping is put in the hostmap table for sticky NAT rules, it ends up having the wrong byte order. Obtained from: ipfilter CVS repo (r1.102), NetBSD CVS repo (r1.12)
* MFC r272554cy2014-10-121-3/+3
| | | | | | ipfilter bug #534 destination list hashing not endian neutral Obtained from: ipfilter CVS repo (r1.26), NetBSD CVS repo (r1.8)
* MFC r272553cy2014-10-121-3/+2
| | | | | | ipfilter bug #538 ipf_p_dns_del should return void Obtained from: ipfilter cvs repo (r1.8)
* MFC r272552cy2014-10-121-11/+34
| | | | | | | ipfilter bug #554 Determining why a ipf rule matches is hard -- replace ipfilter rule compare with new ipf_rule_compare() function. Obtained from: ipfilter CVS rep (r1.129)
* MFC r272551cy2014-10-121-0/+12
| | | | | | ipfiler bug #550 filter rule list corrupted with inserted rules Obtained from: ipfilter CVS repo (r1.128); NetBSD CVS repo (r1.15)
* MFC r272052cy2014-10-121-5/+33
| | | | | | ipfilter bug #558 add in some missing frag table function comments. Obtained from: ipfilter CVS repo (r1.36)
* MFC r271980cy2014-10-121-2/+2
| | | | | | | Check for NULL before de-refencing; in particular sel is assigned to NULL, in the default case, and then couple of lines down we do sel-> Obtained from: NetBSD CVS repo (r1.5)
* MFC r270710 and r270821:hselasky2014-09-041-2/+0
| | | | | | | | | | | | | | | - Update the OFED Linux Emulation layer as a preparation for a hardware driver update from Mellanox Technologies. - Remove empty files from the OFED Linux Emulation layer. - Fix compile warnings related to printf() and the "%lld" and "%llx" format specifiers. - Add some missing 2-clause BSD copyrights. - Add "Mellanox Technologies, Ltd." to list of copyright holders. - Add some new compatibility files. - Fix order of uninit in the mlx4ib module to avoid crash at unload using the new module_exit_order() function. Sponsored by: Mellanox Technologies
* MFC r269585 - Honour WITH and WITHOUT_INET6_SUPPORT.cy2014-08-081-0/+4
| | | | Approved by: glebius (mentor - implicit)
* MFC r268532 and r268585. When world and kernel are built without INET6cy2014-07-211-4/+0
| | | | | | | support, the userland was still built with INET6 turned on. PR: 190964 Approved by: glebius (mentor, implicit)
* MFC r267372-267374: fix various misimplementation of instructions.delphij2014-07-011-14/+25
| | | | Submitted by: Wolf Ramovsky <wolf.ramovsky gmail.com>
* MFC r267634: Fix case where fastroute or "to interface" is used withcy2014-06-251-1/+1
| | | | | | | | incorrect FIB. PR: 183065 Submitted by: p-freebsd-bugs@ziemba.us Approved by: glebius (mentor)
* MFC r266605.cy2014-06-031-8/+6
| | | | | | | | Move mutex creation from ipf_log_soft_init() to ipf_log_soft_create() to be consistent with mutex destruction in ipf_log_soft_destroy(). As a result mutex destruction in ipf_log_soft_fini() is redundant. Approved by: glebius (mentor)
OpenPOWER on IntegriCloud