The following commit has been merged in the linux branch: commit f99288d1761fb3b0decb0fdc4d746406addd29d5 Author: Andrey Yurovsky andrey@cozybit.com Date: Tue Oct 20 12:17:34 2009 -0700

mac80211: trivial: fix spelling in mesh_hwmp

Fix a typo in the description of hwmp_route_info_get(), no function changes.

Signed-off-by: Andrey Yurovsky andrey@cozybit.com Signed-off-by: John W. Linville linville@tuxdriver.com

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index e12a786..29b82e9 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -259,7 +259,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local, * @hwmp_ie: hwmp information element (PREP or PREQ) * * This function updates the path routing information to the originator and the - * transmitter of a HWMP PREQ or PREP fram. + * transmitter of a HWMP PREQ or PREP frame. * * Returns: metric to frame originator or 0 if the frame should not be further * processed