summaryrefslogtreecommitdiffstats
path: root/net/x25
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-10-29 16:53:44 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-29 16:53:44 -0400
commit68783ec73c3b77b405f7670e37ecef15d25f5e55 (patch)
treebf29814fd401872522563bb94067f4f38a575ea2 /net/x25
parent059dfa6a93b779516321e5112db9d7621b1367ba (diff)
parentd954777324ffcba0b2f8119c102237426c654eeb (diff)
downloadlinux-68783ec73c3b77b405f7670e37ecef15d25f5e55.tar.bz2
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/x25')
0 files changed, 0 insertions, 0 deletions