diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /include/net | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/sctp/structs.h | 2 | ||||
-rw-r--r-- | include/net/tcp.h | 2 | ||||
-rw-r--r-- | include/net/wimax.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 7571e32723bf..ff3017744711 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
@@ -989,7 +989,7 @@ struct sctp_transport { | |||
989 | int init_sent_count; | 989 | int init_sent_count; |
990 | 990 | ||
991 | /* state : The current state of this destination, | 991 | /* state : The current state of this destination, |
992 | * : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKOWN. | 992 | * : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKNOWN. |
993 | */ | 993 | */ |
994 | int state; | 994 | int state; |
995 | 995 | ||
diff --git a/include/net/tcp.h b/include/net/tcp.h index e2d2ca2509be..5740b85bc5a0 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -1262,7 +1262,7 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu | |||
1262 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) | 1262 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) |
1263 | 1263 | ||
1264 | /* This function calculates a "timeout" which is equivalent to the timeout of a | 1264 | /* This function calculates a "timeout" which is equivalent to the timeout of a |
1265 | * TCP connection after "boundary" unsucessful, exponentially backed-off | 1265 | * TCP connection after "boundary" unsuccessful, exponentially backed-off |
1266 | * retransmissions with an initial RTO of TCP_RTO_MIN. | 1266 | * retransmissions with an initial RTO of TCP_RTO_MIN. |
1267 | */ | 1267 | */ |
1268 | static inline bool retransmits_timed_out(const struct sock *sk, | 1268 | static inline bool retransmits_timed_out(const struct sock *sk, |
diff --git a/include/net/wimax.h b/include/net/wimax.h index d69c4a7a1267..3461aa1df1e0 100644 --- a/include/net/wimax.h +++ b/include/net/wimax.h | |||
@@ -79,7 +79,7 @@ | |||
79 | * drivers have to only report state changes due to external | 79 | * drivers have to only report state changes due to external |
80 | * conditions. | 80 | * conditions. |
81 | * | 81 | * |
82 | * All API operations are 'atomic', serialized thorough a mutex in the | 82 | * All API operations are 'atomic', serialized through a mutex in the |
83 | * `struct wimax_dev`. | 83 | * `struct wimax_dev`. |
84 | * | 84 | * |
85 | * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK | 85 | * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK |