diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-27 20:15:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-27 20:15:00 +0200 |
| commit | c5f095baa880036702595a09de38e7a0ca420c0b (patch) | |
| tree | 01d704e7f7f6972db774075ee808f7f5a8d03a0d /include/uapi | |
| parent | nfp: flower: fix memory leak in nfp_flower_spawn_vnic_reprs (diff) | |
| parent | netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush (diff) | |
| download | linux-dev-c5f095baa880036702595a09de38e7a0ca420c0b.tar.xz linux-dev-c5f095baa880036702595a09de38e7a0ca420c0b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Add NFT_CHAIN_POLICY_UNSET to replace hardcoded -1 to
specify that the chain policy is unset. The chain policy
field is actually defined as an 8-bit unsigned integer.
2) Remove always true condition reported by smatch in
chain policy check.
3) Fix element lookup on dynamic sets, from Florian Westphal.
4) Use __u8 in ebtables uapi header, from Masahiro Yamada.
5) Bogus EBUSY when removing flowtable after chain flush,
from Laura Garcia Liebana.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/netfilter_bridge/ebtables.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/netfilter_bridge/ebtables.h b/include/uapi/linux/netfilter_bridge/ebtables.h index 3b86c14ea49d..8076c940ffeb 100644 --- a/include/uapi/linux/netfilter_bridge/ebtables.h +++ b/include/uapi/linux/netfilter_bridge/ebtables.h @@ -123,7 +123,7 @@ struct ebt_entry_match { union { struct { char name[EBT_EXTENSION_MAXNAMELEN]; - uint8_t revision; + __u8 revision; }; struct xt_match *match; } u; @@ -136,7 +136,7 @@ struct ebt_entry_watcher { union { struct { char name[EBT_EXTENSION_MAXNAMELEN]; - uint8_t revision; + __u8 revision; }; struct xt_target *watcher; } u; @@ -149,7 +149,7 @@ struct ebt_entry_target { union { struct { char name[EBT_EXTENSION_MAXNAMELEN]; - uint8_t revision; + __u8 revision; }; struct xt_target *target; } u; |