diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-15 01:00:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-15 01:00:10 +0200 |
| commit | 00cbc3dcd1e2758f65e82c46796e259a0ce22fcc (patch) | |
| tree | a9542bbeeca6cfc6d5158b0004302f53f1f8c360 /include/net/ax25.h | |
| parent | net: Start with correct mac_len in skb_network_protocol (diff) | |
| parent | netfilter: nf_tables: fix nft_cmp_fast failure on big endian for size < 4 (diff) | |
| download | linux-00cbc3dcd1e2758f65e82c46796e259a0ce22fcc.tar.xz linux-00cbc3dcd1e2758f65e82c46796e259a0ce22fcc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains three Netfilter fixes for your net tree,
they are:
* Fix missing generation sequence initialization which results in a splat
if lockdep is enabled, it was introduced in the recent works to improve
nf_conntrack scalability, from Andrey Vagin.
* Don't flush the GRE keymap list in nf_conntrack when the pptp helper is
disabled otherwise this crashes due to a double release, from Andrey
Vagin.
* Fix nf_tables cmp fast in big endian, from Patrick McHardy.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ax25.h')
0 files changed, 0 insertions, 0 deletions