diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-29 01:49:04 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-29 01:49:04 -0700 |
commit | 8c3a01d0c259ec8b283c52dbeadda0122582a68b (patch) | |
tree | ebd17d756c14bf86a99185e88f73a7bba0544af9 /net/mac80211/main.c | |
parent | 4c8411f8c115def968820a4df6658ccfd55d7f1a (diff) | |
parent | c97c23e38625f59e3e9869664eeeb0cab1822948 (diff) | |
download | op-kernel-dev-8c3a01d0c259ec8b283c52dbeadda0122582a68b.zip op-kernel-dev-8c3a01d0c259ec8b283c52dbeadda0122582a68b.tar.gz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 915afad..5c87645 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; |