1 files changed, 7 insertions, 6 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 3597b4f14389..4307e764ef0a 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1066,9 +1066,8 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
                 kfree_skb(skb);
 }
 
-#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SKB
 /**
- *      __dev_alloc_skb - allocate an skbuff for sending
+ *      __dev_alloc_skb - allocate an skbuff for receiving
  *      @length: length to allocate
  *      @gfp_mask: get_free_pages mask, passed to alloc_skb
  *
@@ -1087,12 +1086,9 @@ static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
                 skb_reserve(skb, NET_SKB_PAD);
         return skb;
 }
-#else
-extern struct sk_buff *__dev_alloc_skb(unsigned int length, int gfp_mask);
-#endif
 
 /**
- *      dev_alloc_skb - allocate an skbuff for sending
+ *      dev_alloc_skb - allocate an skbuff for receiving
  *      @length: length to allocate
  *
  *      Allocate a new &sk_buff and assign it a usage count of one. The
@@ -1455,5 +1451,10 @@ static inline void skb_init_secmark(struct sk_buff *skb)
 { }
 #endif
 
+static inline int skb_is_gso(const struct sk_buff *skb)
+{
+        return skb_shinfo(skb)->gso_size;
+}
+
 #endif  /* __KERNEL__ */
 #endif  /* _LINUX_SKBUFF_H */