History

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

David S. Miller committed 5 years ago

Commit d489ded2 parents 86dd986 3af409c56 files · +724 −336Browse files

Showing the changes to include/uapi (1 of 56 files). Show all

Unified · Split

include/uapi/linux/pkt_cls.h+1−0
@@ -593,6 +593,7 @@ enum { · 592 unmodified lines
593 TCA_FLOWER_KEY_CT_FLAGS_TRACKED = 1 << 3, /* Conntrack has occurred. */593 TCA_FLOWER_KEY_CT_FLAGS_TRACKED = 1 << 3, /* Conntrack has occurred. */
594 TCA_FLOWER_KEY_CT_FLAGS_INVALID = 1 << 4, /* Conntrack is invalid. */594 TCA_FLOWER_KEY_CT_FLAGS_INVALID = 1 << 4, /* Conntrack is invalid. */
595 TCA_FLOWER_KEY_CT_FLAGS_REPLY = 1 << 5, /* Packet is in the reply direction. */595 TCA_FLOWER_KEY_CT_FLAGS_REPLY = 1 << 5, /* Packet is in the reply direction. */
596 __TCA_FLOWER_KEY_CT_FLAGS_MAX,
596};597};
597 598
598enum {599enum {