diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
| commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
| tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /include/net | |
| parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
| parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/irda/irttp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h index cf80c1af5854..32c385dd9e06 100644 --- a/include/net/irda/irttp.h +++ b/include/net/irda/irttp.h | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | 56 | ||
| 57 | /* Receive queue sizes */ | 57 | /* Receive queue sizes */ |
| 58 | /* Minimum of credit that the peer should hold. | 58 | /* Minimum of credit that the peer should hold. |
| 59 | * If the peer has less credits than 9 frames, we will explicitely send | 59 | * If the peer has less credits than 9 frames, we will explicitly send |
| 60 | * him some credits (through irttp_give_credit() and a specific frame). | 60 | * him some credits (through irttp_give_credit() and a specific frame). |
| 61 | * Note that when we give credits it's likely that it won't be sent in | 61 | * Note that when we give credits it's likely that it won't be sent in |
| 62 | * this LAP window, but in the next one. So, we make sure that the peer | 62 | * this LAP window, but in the next one. So, we make sure that the peer |
| @@ -66,7 +66,7 @@ | |||
| 66 | /* This is the default maximum number of credits held by the peer, so the | 66 | /* This is the default maximum number of credits held by the peer, so the |
| 67 | * default maximum number of frames he can send us before needing flow | 67 | * default maximum number of frames he can send us before needing flow |
| 68 | * control answer from us (this may be negociated differently at TSAP setup). | 68 | * control answer from us (this may be negociated differently at TSAP setup). |
| 69 | * We want to minimise the number of times we have to explicitely send some | 69 | * We want to minimise the number of times we have to explicitly send some |
| 70 | * credit to the peer, hoping we can piggyback it on the return data. In | 70 | * credit to the peer, hoping we can piggyback it on the return data. In |
| 71 | * particular, it doesn't make sense for us to send credit more than once | 71 | * particular, it doesn't make sense for us to send credit more than once |
| 72 | * per LAP window. | 72 | * per LAP window. |