diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
| commit | df39e8ba56a788733d369068c7319e04b1da3cd5 (patch) | |
| tree | 1e9be853bdb455e341cdbf957656f342cfa2eb9e /net/core/skbuff.c | |
| parent | f5572855ec492334d8c3ec0e0e86c31865d5cf07 (diff) | |
| parent | 159d83363b629c91d020734207c1bc788b96af5a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4cd12d99b12e..4fe605fa6f8a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -2225,8 +2225,8 @@ EXPORT_SYMBOL_GPL(skb_pull_rcsum); | |||
| 2225 | * @features: features for the output path (see dev->features) | 2225 | * @features: features for the output path (see dev->features) |
| 2226 | * | 2226 | * |
| 2227 | * This function performs segmentation on the given skb. It returns | 2227 | * This function performs segmentation on the given skb. It returns |
| 2228 | * the segment at the given position. It returns NULL if there are | 2228 | * a pointer to the first in a list of new skbs for the segments. |
| 2229 | * no more segments to generate, or when an error is encountered. | 2229 | * In case of error it returns ERR_PTR(err). |
| 2230 | */ | 2230 | */ |
| 2231 | struct sk_buff *skb_segment(struct sk_buff *skb, int features) | 2231 | struct sk_buff *skb_segment(struct sk_buff *skb, int features) |
| 2232 | { | 2232 | { |