2 files changed, 9 insertions, 1 deletions

diff --git a/include/linux/filter.h b/include/linux/filter.h
index 447a775878f..5334adaf407 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -124,7 +124,9 @@ struct sock_fprog {	/* Required for SO_ATTACH_FILTER. */
 #define SKF_AD_MARK     20
 #define SKF_AD_QUEUE    24
 #define SKF_AD_HATYPE   28
-#define SKF_AD_MAX      32
+#define SKF_AD_RXHASH   32
+#define SKF_AD_CPU      36
+#define SKF_AD_MAX      40
 #define SKF_NET_OFF   (-0x100000)
 #define SKF_LL_OFF    (-0x200000)
 
diff --git a/net/core/filter.c b/net/core/filter.c
index a44d27f9f0f..054e286861d 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -375,6 +375,12 @@ load_b:
                                 return 0;
                         A = skb->dev->type;
                         continue;
+                case SKF_AD_RXHASH:
+                        A = skb->rxhash;
+                        continue;
+                case SKF_AD_CPU:
+                        A = raw_smp_processor_id();
+                        continue;
                 case SKF_AD_NLATTR: {
                         struct nlattr *nla;