Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: remove NFC_* cache bits

These are very very (for long time unused) caching infrastructure
definition, remove then. They have nothing to do with the NFC subsystem.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

-71
-4
include/uapi/linux/netfilter.h
··· 34 34 35 35 /* only for userspace compatibility */ 36 36 #ifndef __KERNEL__ 37 - /* Generic cache responses from hook functions. 38 - <= 0x2000 is used for protocol-flags. */ 39 - #define NFC_UNKNOWN 0x4000 40 - #define NFC_ALTERED 0x8000 41 37 42 38 /* NF_VERDICT_BITS should be 8 now, but userspace might break if this changes */ 43 39 #define NF_VERDICT_BITS 16
-10
include/uapi/linux/netfilter_decnet.h
··· 15 15 16 16 #include <limits.h> /* for INT_MIN, INT_MAX */ 17 17 18 - /* IP Cache bits. */ 19 - /* Src IP address. */ 20 - #define NFC_DN_SRC 0x0001 21 - /* Dest IP address. */ 22 - #define NFC_DN_DST 0x0002 23 - /* Input device. */ 24 - #define NFC_DN_IF_IN 0x0004 25 - /* Output device. */ 26 - #define NFC_DN_IF_OUT 0x0008 27 - 28 18 /* kernel define is in netfilter_defs.h */ 29 19 #define NF_DN_NUMHOOKS 7 30 20 #endif /* ! __KERNEL__ */
-28
include/uapi/linux/netfilter_ipv4.h
··· 13 13 14 14 #include <limits.h> /* for INT_MIN, INT_MAX */ 15 15 16 - /* IP Cache bits. */ 17 - /* Src IP address. */ 18 - #define NFC_IP_SRC 0x0001 19 - /* Dest IP address. */ 20 - #define NFC_IP_DST 0x0002 21 - /* Input device. */ 22 - #define NFC_IP_IF_IN 0x0004 23 - /* Output device. */ 24 - #define NFC_IP_IF_OUT 0x0008 25 - /* TOS. */ 26 - #define NFC_IP_TOS 0x0010 27 - /* Protocol. */ 28 - #define NFC_IP_PROTO 0x0020 29 - /* IP options. */ 30 - #define NFC_IP_OPTIONS 0x0040 31 - /* Frag & flags. */ 32 - #define NFC_IP_FRAG 0x0080 33 - 34 - /* Per-protocol information: only matters if proto match. */ 35 - /* TCP flags. */ 36 - #define NFC_IP_TCPFLAGS 0x0100 37 - /* Source port. */ 38 - #define NFC_IP_SRC_PT 0x0200 39 - /* Dest port. */ 40 - #define NFC_IP_DST_PT 0x0400 41 - /* Something else about the proto */ 42 - #define NFC_IP_PROTO_UNKNOWN 0x2000 43 - 44 16 /* IP Hooks */ 45 17 /* After promisc drops, checksum checks. */ 46 18 #define NF_IP_PRE_ROUTING 0
-29
include/uapi/linux/netfilter_ipv6.h
··· 16 16 17 17 #include <limits.h> /* for INT_MIN, INT_MAX */ 18 18 19 - /* IP Cache bits. */ 20 - /* Src IP address. */ 21 - #define NFC_IP6_SRC 0x0001 22 - /* Dest IP address. */ 23 - #define NFC_IP6_DST 0x0002 24 - /* Input device. */ 25 - #define NFC_IP6_IF_IN 0x0004 26 - /* Output device. */ 27 - #define NFC_IP6_IF_OUT 0x0008 28 - /* TOS. */ 29 - #define NFC_IP6_TOS 0x0010 30 - /* Protocol. */ 31 - #define NFC_IP6_PROTO 0x0020 32 - /* IP options. */ 33 - #define NFC_IP6_OPTIONS 0x0040 34 - /* Frag & flags. */ 35 - #define NFC_IP6_FRAG 0x0080 36 - 37 - 38 - /* Per-protocol information: only matters if proto match. */ 39 - /* TCP flags. */ 40 - #define NFC_IP6_TCPFLAGS 0x0100 41 - /* Source port. */ 42 - #define NFC_IP6_SRC_PT 0x0200 43 - /* Dest port. */ 44 - #define NFC_IP6_DST_PT 0x0400 45 - /* Something else about the proto */ 46 - #define NFC_IP6_PROTO_UNKNOWN 0x2000 47 - 48 19 /* IP6 Hooks */ 49 20 /* After promisc drops, checksum checks. */ 50 21 #define NF_IP6_PRE_ROUTING 0