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>
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user