From e76f0b293d13de3cfd63b01da86dc5361fa38f4f Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Thu, 25 Aug 2005 17:43:14 +0800 Subject: [PATCH] --- yaml --- r: 13578 b: refs/heads/master c: 55135791819270a412dfb99f66301f02c72edadf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ipw2200.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fc5cb50fa15c..c603a682181a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b99659f97ca20e5f1ea56253a9449d278d825d5 +refs/heads/master: 55135791819270a412dfb99f66301f02c72edadf diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c index 4cdb4748b761..bda292f7f82c 100644 --- a/trunk/drivers/net/wireless/ipw2200.c +++ b/trunk/drivers/net/wireless/ipw2200.c @@ -7907,7 +7907,7 @@ static void ipw_handle_data_packet(struct ipw_priv *priv, IPW_DEBUG_RX("Rx packet of %d bytes.\n", rxb->skb->len); /* HW decrypt will not clear the WEP bit, MIC, PN, etc. */ - if (!priv->ieee->host_decrypt) + if (!priv->ieee->host_decrypt && priv->ieee->iw_mode != IW_MODE_MONITOR) ipw_rebuild_decrypted_skb(priv, rxb->skb); if (!ieee80211_rx(priv->ieee, rxb->skb, stats))