[XFS] Fix merge failures

[pandora-kernel.git] / include / linux / filter.h

diff --git a/include/linux/filter.h b/include/linux/filter.h
index b6ea9aa..1354aaf 100644 (file)
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -122,7 +122,8 @@ struct sock_fprog   /* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_PKTTYPE         4
 #define SKF_AD_IFINDEX         8
 #define SKF_AD_NLATTR  12
-#define SKF_AD_MAX     16
+#define SKF_AD_NLATTR_NEST     16
+#define SKF_AD_MAX     20
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)