diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-15 16:59:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-15 16:59:38 -0800 |
| commit | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (patch) | |
| tree | 0ec4807d49a602ba785e60e5352b542f1581d4c9 /include/net/tcp.h | |
| parent | fb6d73d3014babb69f5cc2d1d78b31e9d09fc5df (diff) | |
| parent | 5a6f294e43e432bd207a702fea49ebb303ef9b23 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 0f9848011972..d78025f9fbea 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -552,8 +552,8 @@ extern u32 __tcp_select_window(struct sock *sk); /* TCP timestamps are only 32-bits, this causes a slight * complication on 64-bit systems since we store a snapshot - * of jiffies in the buffer control blocks below. We decidedly - * only use of the low 32-bits of jiffies and hide the ugly + * of jiffies in the buffer control blocks below. We decided + * to use only the low 32-bits of jiffies and hide the ugly * casts with the following macro. */ #define tcp_time_stamp ((__u32)(jiffies)) |