aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /net/mac80211
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mesh_pathtbl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 751c4d0e2b36..719ddbc9e48c 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 */
@@ -530,7 +530,7 @@ static void mesh_path_node_reclaim(struct rcu_head *rp)
530 * @addr: dst address (ETH_ALEN length) 530 * @addr: dst address (ETH_ALEN length)
531 * @sdata: local subif 531 * @sdata: local subif
532 * 532 *
533 * Returns: 0 if succesful 533 * Returns: 0 if successful
534 */ 534 */
535int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata) 535int mesh_path_del(u8 *addr, struct ieee80211_sub_if_data *sdata)
536{ 536{