From 266a03bb8d79c318af74d1ac6a36e43e8e5910a8 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Fri, 5 Aug 2005 17:17:35 +0800 Subject: [PATCH] --- yaml --- r: 13563 b: refs/heads/master c: 87b016cb64b267a6f791494a4cfd84e84e022ebb h: refs/heads/master i: 13561: 09a61805cee0bdbd1e1fff1a5977c11f158cedbb 13559: 00f10654bdb3a39008bc2d26726754400ea2275c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ipw2200.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index baa2ead5b387..122d4f59e963 100644 --- 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 index 6e79ae24ee1c..483993a4ca4b 100644 --- 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; }