From aacd77cd748a255d1d6e00a9de4eda300a738b23 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 6 May 2010 21:58:51 -0700
Subject: [PATCH] --- yaml --- r: 194801 b: refs/heads/master c:
 18e8c134f4e984e6639e62846345192816f06d5c h: refs/heads/master i:   194799:
 c9a12491a12c53008287709088954d01e5ebed94 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cfbeff37f9f8..217bd58ec46e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6bc0149d8f2300bffa03ea6fea3ca39744277a6
+refs/heads/master: 18e8c134f4e984e6639e62846345192816f06d5c
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 88d55395a27c..c9525bce80f6 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -1361,9 +1361,12 @@ static inline int skb_network_offset(const struct sk_buff *skb)
  *
  * Various parts of the networking layer expect at least 32 bytes of
  * headroom, you should not reduce this.
+ * With RPS, we raised NET_SKB_PAD to 64 so that get_rps_cpus() fetches span
+ * a 64 bytes aligned block to fit modern (>= 64 bytes) cache line sizes
+ * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
  */
 #ifndef NET_SKB_PAD
-#define NET_SKB_PAD	32
+#define NET_SKB_PAD	64
 #endif
 
 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);