diff --git a/[refs] b/[refs] index 095b25ba81d5..73c2cb68d196 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f37f0afb2916ccf287428983026261db78c7661a +refs/heads/master: 4c821d753d5c097babd6609bcd85f08e254a3505 diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 0d0fd28a9041..608701339620 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -2131,8 +2131,8 @@ EXPORT_SYMBOL_GPL(skb_pull_rcsum); * @features: features for the output path (see dev->features) * * This function performs segmentation on the given skb. It returns - * the segment at the given position. It returns NULL if there are - * no more segments to generate, or when an error is encountered. + * a pointer to the first in a list of new skbs for the segments. + * In case of error it returns ERR_PTR(err). */ struct sk_buff *skb_segment(struct sk_buff *skb, int features) {