From 4ccb24f316c2b51a0395036ab877bb09fa98bec1 Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Thu, 22 Dec 2011 23:39:14 +0000
Subject: [PATCH] --- yaml --- r: 279052 b: refs/heads/master c:
 9d4dde5215779f4099730194ad30624fdba3d8b2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3fe916390cb2..ee3fa16d4104 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f87ce5b254d4eb5b5ec2bfcc78d714fa0e249288
+refs/heads/master: 9d4dde5215779f4099730194ad30624fdba3d8b2
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 12e6fed73f8e..f47f0c3939f2 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -128,13 +128,17 @@ struct sk_buff_head {
 
 struct sk_buff;
 
-/* To allow 64K frame to be packed as single skb without frag_list. Since
- * GRO uses frags we allocate at least 16 regardless of page size.
+/* To allow 64K frame to be packed as single skb without frag_list we
+ * require 64K/PAGE_SIZE pages plus 1 additional page to allow for
+ * buffers which do not start on a page boundary.
+ *
+ * Since GRO uses frags we allocate at least 16 regardless of page
+ * size.
  */
-#if (65536/PAGE_SIZE + 2) < 16
+#if (65536/PAGE_SIZE + 1) < 16
 #define MAX_SKB_FRAGS 16UL
 #else
-#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2)
+#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 1)
 #endif
 
 typedef struct skb_frag_struct skb_frag_t;