From 0e5e70a7735c02417cd58d7f5f53e34724aace6c Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Sun, 13 Apr 2008 21:52:48 -0700
Subject: [PATCH] --- yaml --- r: 88313 b: refs/heads/master c:
 4c821d753d5c097babd6609bcd85f08e254a3505 h: refs/heads/master i:   88311:
 efcd1def57beb3a6818781d0fa99a46c80f9f09e v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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)
 {