diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-29 14:29:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-29 14:29:06 -0400 |
| commit | 14d3692f04a050a0d1e4637b56f997a168c591f6 (patch) | |
| tree | 995b4c8ad7e1269fec39f1e92b865ac36493cec3 /samples/rpmsg | |
| parent | 674853b222168f2066db028cad89ab52cbcdeee5 (diff) | |
| parent | eee1d5a14780b9391ec51f3feaf4cffb521ddbb1 (diff) | |
| download | linux-14d3692f04a050a0d1e4637b56f997a168c591f6.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says: ==================== The following patchset contains relevant updates for the Netfilter tree, they are: * Enhancements for ipset: Add the counter extension for sets, this information can be used from the iptables set match, to change the matching behaviour. Jozsef required to add the extension infrastructure and moved the existing timeout support upon it. This also includes a change in net/sched/em_ipset to adapt it to the new extension structure. * Enhancements for performance boosting in nfnetlink_queue: Add new configuration flags that allows user-space to receive big packets (GRO) and to disable checksumming calculation. This were proposed by Eric Dumazet during the Netfilter Workshop 2013 in Copenhagen. Florian Westphal was kind enough to find the time to materialize the proposal. * A sparse fix from Simon, he noticed it in the SCTP NAT helper, the fix required a change in the interface of sctp_end_cksum. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/rpmsg')
0 files changed, 0 insertions, 0 deletions