[PATCH 1/7] drivers/staging: Remove double test

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Julia Lawall
Date: Saturday, August 28, 2010 - 8:41 am

The 1 element of the array is tested twice.  Change the code so that the
remaining 3 element of the array is tested instead of testing the 1 element
a second time.

The sematic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@expression@
expression E;
@@

(
* E
  || ... || E
|
* E
  && ... && E
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
This is just as guess as to what the correct code should be.

 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c  |    2 +-
 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c |    2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
index aaf9b9d..9318695 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c
@@ -2579,7 +2579,7 @@ static inline void update_network(struct ieee80211_network *dst,
 	if(src->wmm_param[0].ac_aci_acm_aifsn|| \
 	   src->wmm_param[1].ac_aci_acm_aifsn|| \
 	   src->wmm_param[2].ac_aci_acm_aifsn|| \
-	   src->wmm_param[1].ac_aci_acm_aifsn) {
+	   src->wmm_param[3].ac_aci_acm_aifsn) {
 	  memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN);
 	}
 	//dst->QoS_Enable = src->QoS_Enable;
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
index 09a02f7..7230cf5 100644
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
@@ -2298,7 +2298,7 @@ static inline void update_network(struct ieee80211_network *dst,
 	if(src->wmm_param[0].ac_aci_acm_aifsn|| \
 	   src->wmm_param[1].ac_aci_acm_aifsn|| \
 	   src->wmm_param[2].ac_aci_acm_aifsn|| \
-	   src->wmm_param[1].ac_aci_acm_aifsn) {
+	   src->wmm_param[3].ac_aci_acm_aifsn) {
 	  memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN);
 	}
 	//dst->QoS_Enable = src->QoS_Enable;
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 192123f..c8ca9d8 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -2391,7 +2391,7 @@ static inline void update_network(struct ieee80211_network *dst,
 	if(src->wmm_param[0].ac_aci_acm_aifsn|| \
 	   src->wmm_param[1].ac_aci_acm_aifsn|| \
 	   src->wmm_param[2].ac_aci_acm_aifsn|| \
-	   src->wmm_param[1].ac_aci_acm_aifsn) {
+	   src->wmm_param[3].ac_aci_acm_aifsn) {
 	  memcpy(dst->wmm_param, src->wmm_param, WME_AC_PRAM_LEN);
 	}
 	//dst->QoS_Enable = src->QoS_Enable;

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/7] Remove double test, Julia Lawall, (Sat Aug 28, 8:40 am)
[PATCH 1/7] drivers/staging: Remove double test, Julia Lawall, (Sat Aug 28, 8:41 am)
[PATCH 2/7] drivers/usb/gadget: Remove double test, Julia Lawall, (Sat Aug 28, 8:41 am)
[PATCH 3/7] drivers/net/atl1c: Remove double test, Julia Lawall, (Sat Aug 28, 8:41 am)
[PATCH 4/7] arch/x86/mm/kmemcheck: Remove double test, Julia Lawall, (Sat Aug 28, 8:41 am)
[PATCH 5/7] drivers/regulator: Remove double test, Julia Lawall, (Sat Aug 28, 8:41 am)
[PATCH 6/7] drivers/media/dvb/siano: Remove double test, Julia Lawall, (Sat Aug 28, 8:41 am)
[PATCH 7/7] net/wireless: Remove double test, Julia Lawall, (Sat Aug 28, 8:41 am)
Re: [PATCH 2/7] drivers/usb/gadget: Remove double test, Dan Carpenter, (Sat Aug 28, 9:37 am)
Re: [PATCH 2/7] drivers/usb/gadget: Remove double test, Julia Lawall, (Sat Aug 28, 9:49 am)
Re: [PATCH 3/7] drivers/net/atl1c: Remove double test, Dan Carpenter, (Sat Aug 28, 9:50 am)
Re: [PATCH 3/7] drivers/net/atl1c: Remove double test, Luis R. Rodriguez, (Sat Aug 28, 1:10 pm)
[tip:x86/mm] x86, kmemcheck: Remove double test, tip-bot for Julia Lawall, (Mon Aug 30, 1:36 am)
Re: [tip:x86/mm] x86, kmemcheck: Remove double test, Vegard Nossum, (Thu Sep 2, 12:08 pm)
Re: [tip:x86/mm] x86, kmemcheck: Remove double test, Ingo Molnar, (Thu Sep 2, 11:21 pm)