diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
| commit | c5974932c1e8514d3478573bb52beebeb2c786dd (patch) | |
| tree | a204156fbb0036fb76e89ceffa15a30e90bc3f75 /net/core/skbuff.c | |
| parent | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (diff) | |
| parent | e760e716d47b48caf98da348368fd41b4a9b9e7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 4e354221ec23..cfc07dac636c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -1907,11 +1907,11 @@ void skb_prepare_seq_read(struct sk_buff *skb, unsigned int from, | |||
| 1907 | * of bytes already consumed and the next call to | 1907 | * of bytes already consumed and the next call to |
| 1908 | * skb_seq_read() will return the remaining part of the block. | 1908 | * skb_seq_read() will return the remaining part of the block. |
| 1909 | * | 1909 | * |
| 1910 | * Note: The size of each block of data returned can be arbitary, | 1910 | * Note 1: The size of each block of data returned can be arbitary, |
| 1911 | * this limitation is the cost for zerocopy seqeuental | 1911 | * this limitation is the cost for zerocopy seqeuental |
| 1912 | * reads of potentially non linear data. | 1912 | * reads of potentially non linear data. |
| 1913 | * | 1913 | * |
| 1914 | * Note: Fragment lists within fragments are not implemented | 1914 | * Note 2: Fragment lists within fragments are not implemented |
| 1915 | * at the moment, state->root_skb could be replaced with | 1915 | * at the moment, state->root_skb could be replaced with |
| 1916 | * a stack for this purpose. | 1916 | * a stack for this purpose. |
| 1917 | */ | 1917 | */ |