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 | |
| parent | [PATCH] powerpc: Fix sparsemem with memory holes [was Re: ppc64 oops..] (diff) | |
| parent | [NETFILTER] Free layer-3 specific protocol tables at cleanup (diff) | |
| download | linux-dev-f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081.tar.xz linux-dev-f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/llc_pdu.h | 2 | ||||
| -rw-r--r-- | include/net/tcp.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h index c7a959428b4f..8f6306581fa7 100644 --- a/include/net/llc_pdu.h +++ b/include/net/llc_pdu.h @@ -357,7 +357,7 @@ static inline void llc_pdu_init_as_test_rsp(struct sk_buff *skb, /* LLC Type 1 XID command/response information fields format */ struct llc_xid_info { - u8 fmt_id; /* always 0x18 for LLC */ + u8 fmt_id; /* always 0x81 for LLC */ u8 type; /* different if NULL/non-NULL LSAP */ u8 rw; /* sender receive window */ }; 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)) |