diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-01-07 18:38:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-07 18:38:17 -0500 |
| commit | a04c0e2c0d4f284503fc1249bb4d2d7064c0bd0c (patch) | |
| tree | 5084957e552c15d77e2171f3a168c71d97ae4d01 /drivers/net | |
| parent | tipc: correctly unlink packets from deferred packet queue (diff) | |
| parent | netfilter: only warn once on wrong seqadj usage (diff) | |
| download | linux-dev-a04c0e2c0d4f284503fc1249bb4d2d7064c0bd0c.tar.xz linux-dev-a04c0e2c0d4f284503fc1249bb4d2d7064c0bd0c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
The following patchset contains two patches:
* fix the IRC NAT helper which was broken when adding (incomplete) IPv6
support, from Daniel Borkmann.
* Refine the previous bugtrap that Jesper added to catch problems for the
usage of the sequence adjustment extension in IPVs in Dec 16th, it may
spam messages in case of finding a real bug.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions