From 15682a00ad6ce855d2401b745cc59be4e8420ad0 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Wed, 13 Jul 2005 12:24:51 -0500
Subject: [PATCH] --- yaml --- r: 13555 b: refs/heads/master c:
 a2d73e60bb018da74ba508943c79c83659f3a883 h: refs/heads/master i:   13553:
 012fc0e39b54d11ed7bfd6bb731f856755b8baa4   13551:
 3b68f197cdf95f8cd183e40a2eae9ec5e755b655 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/wireless/ipw2200.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e54ac2398e03..ca9e74c8a020 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afbf30a2b78cac38e6ddae10a73063943b4783ee
+refs/heads/master: a2d73e60bb018da74ba508943c79c83659f3a883
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index 1b6f0277a3e9..8f7e9ac37f86 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -7587,7 +7587,10 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv,
 		memmove(skb->data + IEEE80211_3ADDR_LEN,
 			skb->data + IEEE80211_3ADDR_LEN + 8,
 			skb->len - IEEE80211_3ADDR_LEN - 8);
-		skb_trim(skb, skb->len - 8);	/* MIC */
+		if (fc & IEEE80211_FCTL_MOREFRAGS)
+			skb_trim(skb, skb->len - 16);	/* 2*MIC */
+		else
+			skb_trim(skb, skb->len - 8);	/* MIC */
 		break;
 	case SEC_LEVEL_2:
 		break;
@@ -7596,7 +7599,10 @@ static void ipw_rebuild_decrypted_skb(struct ipw_priv *priv,
 		memmove(skb->data + IEEE80211_3ADDR_LEN,
 			skb->data + IEEE80211_3ADDR_LEN + 4,
 			skb->len - IEEE80211_3ADDR_LEN - 4);
-		skb_trim(skb, skb->len - 4);	/* ICV */
+		if (fc & IEEE80211_FCTL_MOREFRAGS)
+			skb_trim(skb, skb->len - 8);	/* 2*ICV */
+		else
+			skb_trim(skb, skb->len - 4);	/* ICV */
 		break;
 	case SEC_LEVEL_0:
 		break;