Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / uapi / linux / filter.h

diff --git a/include/uapi/linux/filter.h b/include/uapi/linux/filter.h
index 47785d5..c97340e 100644 (file)
--- a/include/uapi/linux/filter.h
+++ b/include/uapi/linux/filter.h
@@ -77,9 +77,13 @@ struct sock_fprog {  /* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_VLAN_TAG_PRESENT 48
 #define SKF_AD_PAY_OFFSET      52
 #define SKF_AD_RANDOM  56
-#define SKF_AD_MAX     60
-#define SKF_NET_OFF   (-0x100000)
-#define SKF_LL_OFF    (-0x200000)
+#define SKF_AD_VLAN_TPID       60
+#define SKF_AD_MAX     64
 
+#define SKF_NET_OFF    (-0x100000)
+#define SKF_LL_OFF     (-0x200000)
+
+#define BPF_NET_OFF    SKF_NET_OFF
+#define BPF_LL_OFF     SKF_LL_OFF
 
 #endif /* _UAPI__LINUX_FILTER_H__ */