Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / include / linux / skbuff.h

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index c413c588a24f854be9e4df78d8a6872b6b1ff9f3..ee38a41274759f279be1c0752a7fab63fac517c8 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -471,9 +471,9 @@ enum {
 
        SKB_GSO_GRE_CSUM = 1 << 8,
 
-       SKB_GSO_IPIP = 1 << 9,
+       SKB_GSO_IPXIP4 = 1 << 9,
 
-       SKB_GSO_SIT = 1 << 10,
+       SKB_GSO_IPXIP6 = 1 << 10,
 
        SKB_GSO_UDP_TUNNEL = 1 << 11,
 
@@ -2467,7 +2467,7 @@ static inline struct page *__dev_alloc_pages(gfp_t gfp_mask,
 
 static inline struct page *dev_alloc_pages(unsigned int order)
 {
-       return __dev_alloc_pages(GFP_ATOMIC, order);
+       return __dev_alloc_pages(GFP_ATOMIC | __GFP_NOWARN, order);
 }
 
 /**
@@ -2485,7 +2485,7 @@ static inline struct page *__dev_alloc_page(gfp_t gfp_mask)
 
 static inline struct page *dev_alloc_page(void)
 {
-       return __dev_alloc_page(GFP_ATOMIC);
+       return dev_alloc_pages(0);
 }
 
 /**