git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' into for-linus
[safe/jmp/linux-2.6]
/
net
/
mac80211
/
mesh_plink.c
diff --git
a/net/mac80211/mesh_plink.c
b/net/mac80211/mesh_plink.c
index
bc4e20e
..
1a29c4a
100644
(file)
--- a/
net/mac80211/mesh_plink.c
+++ b/
net/mac80211/mesh_plink.c
@@
-744,7
+744,7
@@
void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
break;
default:
/* should not get here, PLINK_BLOCKED is dealt with at the
- * beg
gi
ning of the function
+ * beg
in
ning of the function
*/
spin_unlock_bh(&sta->lock);
break;