[NET]: Un-deprecate skb_linearize(), we can re-deprecate in 2.7.x

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 77162e4c28192a3e8f4bc368a6cf19e5944e792f..b7b96854e23cb660991723c87a41231e15a03903 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1132,7 +1132,7 @@ static inline struct sk_buff *skb_padto(struct sk_buff *skb, unsigned int len)
  *     is returned and the old skb data released.
  */
 extern int __skb_linearize(struct sk_buff *skb, int gfp);
-static inline int __deprecated skb_linearize(struct sk_buff *skb, int gfp)
+static inline int skb_linearize(struct sk_buff *skb, int gfp)
 {
        return __skb_linearize(skb, gfp);
 }