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 /net/mac80211 | |
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 'net/mac80211')
-rw-r--r-- | net/mac80211/mesh_pathtbl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index a8da23905c70..0192cfdacae4 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c | |||
@@ -244,7 +244,7 @@ struct mesh_path *mesh_path_lookup_by_idx(int idx, struct ieee80211_sub_if_data | |||
244 | * @addr: destination address of the path (ETH_ALEN length) | 244 | * @addr: destination address of the path (ETH_ALEN length) |
245 | * @sdata: local subif | 245 | * @sdata: local subif |
246 | * | 246 | * |
247 | * Returns: 0 on sucess | 247 | * Returns: 0 on success |
248 | * | 248 | * |
249 | * State: the initial state of the new path is set to 0 | 249 | * State: the initial state of the new path is set to 0 |
250 | */ | 250 | */ |
@@ -532,7 +532,7 @@ static void mesh_path_node_reclaim(struct rcu_head *rp) | |||
532 | * @addr: dst address (ETH_ALEN length) | 532 | * @addr: dst address (ETH_ALEN length) |
533 | * @sdata: local subif | 533 | * @sdata: local subif |
534 | * | 534 | * |
535 | * Returns: 0 if succesful | 535 | * Returns: 0 if successful |
536 | */ | 536 | */ |
537 | int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) | 537 | int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) |
538 | { | 538 | { |