diff --git a/[refs] b/[refs] index 7b7e21030880..36e74d7726d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15300c1df7e8c85cfbd5155a59cd6f767af70daa +refs/heads/master: 4498dbcd2d85b67e9f46790bcfee5860d2dd1762 diff --git a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c index aaf9b9dc45e6..9318695042fb 100644 --- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c +++ b/trunk/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/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index 192123fbec7f..c8ca9d8ed5d2 100644 --- a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +++ b/trunk/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;