diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
| commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
| tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /include/net | |
| parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
| parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/irda/irlmp.h | 2 | ||||
| -rw-r--r-- | include/net/sock.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index fff11b7fe8a4..591f78631f13 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h | |||
| @@ -134,7 +134,7 @@ typedef struct { | |||
| 134 | } CACHE_ENTRY; | 134 | } CACHE_ENTRY; |
| 135 | 135 | ||
| 136 | /* | 136 | /* |
| 137 | * Information about each registred IrLAP layer | 137 | * Information about each registered IrLAP layer |
| 138 | */ | 138 | */ |
| 139 | struct lap_cb { | 139 | struct lap_cb { |
| 140 | irda_queue_t queue; /* Must be first */ | 140 | irda_queue_t queue; /* Must be first */ |
diff --git a/include/net/sock.h b/include/net/sock.h index 0a9a01a5b0d7..93a6745bfdb2 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -231,7 +231,7 @@ struct cg_proto; | |||
| 231 | * @sk_sndbuf: size of send buffer in bytes | 231 | * @sk_sndbuf: size of send buffer in bytes |
| 232 | * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, | 232 | * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, |
| 233 | * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings | 233 | * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings |
| 234 | * @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets | 234 | * @sk_no_check: %SO_NO_CHECK setting, whether or not checkup packets |
| 235 | * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) | 235 | * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) |
| 236 | * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) | 236 | * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) |
| 237 | * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) | 237 | * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) |