diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-29 21:53:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-29 21:53:44 +0100 |
| commit | 68783ec73c3b77b405f7670e37ecef15d25f5e55 (patch) | |
| tree | bf29814fd401872522563bb94067f4f38a575ea2 /net/atm/mpc.h | |
| parent | xen-netback: use jiffies_64 value to calculate credit timeout (diff) | |
| parent | netfilter: xt_NFQUEUE: fix --queue-bypass regression (diff) | |
| download | linux-68783ec73c3b77b405f7670e37ecef15d25f5e55.tar.xz linux-68783ec73c3b77b405f7670e37ecef15d25f5e55.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
This pull request contains the following netfilter fix:
* fix --queue-bypass in xt_NFQUEUE revision 3. While adding the
revision 3 of this target, the bypass flags were not correctly
handled anymore, thus, breaking packet bypassing if no application
is listening from userspace, patch from Holger Eitzenberger,
reported by Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/mpc.h')
0 files changed, 0 insertions, 0 deletions