diff --git a/[refs] b/[refs]
index c25a28df8f1a..e3b4c7158acd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5256c51232d8312755e8de2b514c426b19b101a
+refs/heads/master: cb4dfe562cac6fcb544df752e40c1d78000d0712
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index b2c41d19735c..0b53c43ac92e 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -129,8 +129,13 @@ typedef struct skb_frag_struct skb_frag_t;
 
 struct skb_frag_struct {
 	struct page *page;
+#if (BITS_PER_LONG > 32) || (PAGE_SIZE >= 65536)
 	__u32 page_offset;
 	__u32 size;
+#else
+	__u16 page_offset;
+	__u16 size;
+#endif
 };
 
 #define HAVE_HW_TIME_STAMP