diff --git a/[refs] b/[refs]
index 76bc70927e4d..5c277a53c832 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4910ac6c526d2868adcb5893e0c428473de862b5
+refs/heads/master: a715dea3c8e9ef2771c534e05ee1d36f65987e64
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 24cfa626931e..239083bfea13 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -122,8 +122,14 @@ struct sk_buff_head {
 
 struct sk_buff;
 
-/* To allow 64K frame to be packed as single skb without frag_list */
+/* 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.
+ */
+#if (65536/PAGE_SIZE + 2) < 16
+#define MAX_SKB_FRAGS 16
+#else
 #define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2)
+#endif
 
 typedef struct skb_frag_struct skb_frag_t;