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

2017-01-17 15:19:37 -05:00
parent e60a42635b a249708bc2
commit 580bdf5650
268 changed files with 2487 additions and 1485 deletions
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -342,7 +342,7 @@ enum {
 	TCA_BPF_NAME,
 	TCA_BPF_FLAGS,
 	TCA_BPF_FLAGS_GEN,
-	TCA_BPF_DIGEST,
+	TCA_BPF_TAG,
 	__TCA_BPF_MAX,
 };