diff --git a/[refs] b/[refs] index 0ce323b6634e..4583abb56dbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1567ca7eec7664b8be3b07755ac59dc1b1ec76cb +refs/heads/master: 1483b8744e1a189b2018e2a1bd82f343d6bb52d2 diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 86e5682728be..6ef7008a3ef3 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -277,6 +277,10 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, */ struct sk_buff *dev_alloc_skb(unsigned int length) { + /* + * There is more code here than it seems: + * __def_alloc_skb is an inline + */ return __dev_alloc_skb(length, GFP_ATOMIC); } EXPORT_SYMBOL(dev_alloc_skb);