Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2021-02-16 17:30:20 -08:00
parent 86dd9868b8 3af409ca27
commit d489ded1a3
56 changed files with 726 additions and 338 deletions
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -593,6 +593,7 @@ enum {
 	TCA_FLOWER_KEY_CT_FLAGS_TRACKED = 1 << 3, /* Conntrack has occurred. */
 	TCA_FLOWER_KEY_CT_FLAGS_INVALID = 1 << 4, /* Conntrack is invalid. */
 	TCA_FLOWER_KEY_CT_FLAGS_REPLY = 1 << 5, /* Packet is in the reply direction. */
+	__TCA_FLOWER_KEY_CT_FLAGS_MAX,
 };

 enum {