Florian Westphal
4c82fd0abb
netfilter: uapi: correct UNTRACKED conntrack state bit number
...
nft_ct exposes this bit to userspace. This used to be
#define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_NUMBER + 1))
(IP_CT_NUMBER is 5, so this was 0x40)
.. but this got changed to 8 (0x100) when the untracked object got removed.
Replace this with a literal 6 to prevent further incompatible changes
in case IP_CT_NUMBER ever increases.
Fixes: cc41c84b7e ("netfilter: kill the fake untracked conntrack objects")
Reported-by: Li Shuang <shuali@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2017-12-21 09:45:34 +01:00
..
acpi
Merge branch 'acpi-ec' into acpi
2017-11-30 13:37:29 +01:00
asm-generic
mm: switch to 'define pmd_write' instead of __HAVE_ARCH_PMD_WRITE
2017-11-29 18:40:42 -08:00
clocksource
arm64 updates for 4.15
2017-11-15 10:56:56 -08:00
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2017-12-11 16:32:45 -08:00
drm
drm: rework delayed connector cleanup in connector_iter
2017-12-13 22:59:00 +01:00
dt-bindings
fixes/cleanups for rc1, non-desktop flags for VR
2017-11-23 21:04:56 -10:00
keys
kvm
KVM: arm/arm64: Don't enable/disable physical timer access on VHE
2017-11-29 16:46:09 +01:00
linux
net/mlx5: Cleanup IRQs in case of unload failure
2017-12-19 23:24:05 +02:00
math-emu
media
media updates for v4.15-rc1
2017-11-15 20:30:12 -08:00
memory
misc
net
cls_bpf: fix offload assumptions after callback conversion
2017-12-20 13:08:18 -05:00
pcmcia
ras
rdma
Updates for 4.15 kernel merge window
2017-11-15 14:54:53 -08:00
scsi
scsi: libsas: align sata_device's rps_resp on a cacheline
2017-11-21 23:06:32 -05:00
soc
We have two changes to the core framework this time around. The first being a
2017-11-17 20:04:24 -08:00
sound
ALSA: hda - Fix yet remaining issue with vmaster 0dB initialization
2017-11-22 12:34:56 +01:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2017-11-24 19:19:20 -10:00
trace
Various fix ups.
2017-12-14 18:21:33 -08:00
uapi
netfilter: uapi: correct UNTRACKED conntrack state bit number
2017-12-21 09:45:34 +01:00
video
fbdev changes for v4.15:
2017-11-20 21:50:24 -10:00
xen
xen: features and fixes for v4.15-rc1
2017-11-16 13:06:27 -08:00