summaryrefslogtreecommitdiff
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-12 11:27:22 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-12 11:27:22 +0200
commitbb6dfb32f90094fea647e1f27d994a8b6ddd2766 (patch)
treee63681727543bcc3251bbc82b81a9cc822cc3f5e /net/mac80211/main.c
parent4f384f8bcdb5d618a0a68fb84c809e602c798b8f (diff)
parent5e70b7f3c24468bb1635b295945edb48ecd9656a (diff)
Merge branch 'linus' into x86/gart
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 915afadb0602..5c876450b14c 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1313,7 +1313,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
/*
* Clear the TX filter mask for this STA when sending the next
* packet. If the STA went to power save mode, this will happen
- * happen when it wakes up for the next time.
+ * when it wakes up for the next time.
*/
sta->flags |= WLAN_STA_CLEAR_PS_FILT;