---

yaml --- r: 13563 b: refs/heads/master c: 87b016c h: refs/heads/master i: 13561: 09a6180 13559: 00f1065 v: v3
git-mirror · Nov 7, 2005 · 266a03b · 266a03b
1 parent 9a8cfab
commit 266a03b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f36f8088ada6c63719a970616078887f82e226c
+refs/heads/master: 87b016cb64b267a6f791494a4cfd84e84e022ebb
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
@@ -7696,7 +7696,6 @@ static inline int is_network_packet(struct ipw_priv *priv,
 static inline int is_duplicate_packet(struct ipw_priv *priv,
 				      struct ieee80211_hdr_4addr *header)
 {
-	u16 fc = le16_to_cpu(header->frame_ctl);
 	u16 sc = le16_to_cpu(header->seq_ctl);
 	u16 seq = WLAN_GET_SEQ_SEQ(sc);
 	u16 frag = WLAN_GET_SEQ_FRAG(sc);
@@ -7760,7 +7759,10 @@ static inline int is_duplicate_packet(struct ipw_priv *priv,
 	return 0;
 
       drop:
-	BUG_ON(!(fc & IEEE80211_FCTL_RETRY));
+	/* Comment this line now since we observed the card receives
+	 * duplicate packets but the FCTL_RETRY bit is not set in the
+	 * IBSS mode with fragmentation enabled.
+	 BUG_ON(!(le16_to_cpu(header->frame_ctl) & IEEE80211_FCTL_RETRY)); */
 	return 1;
 }