Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / rtl8192u / ieee80211 / ieee80211_rx.c

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index 192123fbec7fa3cd8a00e9917ac46abd3cb60e54..c8ca9d8ed5d2121aa1bb18012abe2269d863f92c 100644 (file)
--- 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;