net: Added ASSERT_RTNL() to dev_open() and dev_close().

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / tipc / core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 3fe9b70331d9a10f8d20583c7a07f4af1ed477be..325404fd4eb5efaebe86109333b9ebc715593762 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -316,7 +316,7 @@ static inline struct sk_buff *buf_acquire(u32 size)
        struct sk_buff *skb;
        unsigned int buf_size = (BUF_HEADROOM + size + 3) & ~3u;
 
-       skb = alloc_skb(buf_size, GFP_ATOMIC);
+       skb = alloc_skb_fclone(buf_size, GFP_ATOMIC);
        if (skb) {
                skb_reserve(skb, BUF_HEADROOM);
                skb_put(skb, size);
@@ -334,8 +334,19 @@ static inline struct sk_buff *buf_acquire(u32 size)
 
 static inline void buf_discard(struct sk_buff *skb)
 {
-       if (likely(skb != NULL))
-               kfree_skb(skb);
+       kfree_skb(skb);
+}
+
+/**
+ * buf_linearize - convert a TIPC message buffer into a single contiguous piece
+ * @skb: message buffer
+ *
+ * Returns 0 on success.
+ */
+
+static inline int buf_linearize(struct sk_buff *skb)
+{
+       return skb_linearize(skb);
 }
 
 #endif