From 5b07ffa5b940c347e489bc4e2bf381ff7467a3e2 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Thu, 29 Sep 2011 15:34:22 -0700 Subject: [PATCH] --- yaml --- r: 268615 b: refs/heads/master c: 4c5af8e260a7a35760fe68fe5278a717f33d1be4 h: refs/heads/master i: 268613: ef6f1033fdd475456caee5897c4b771ee5c37191 268611: 91cc00d124da8c090acc330453120d42ba0469ed 268607: 7e628ca45ebc0dc3cbee235e70d44792655e8a17 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d45a27aa6c18..527de4969bd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25d3f4bc66ae77cf72202777332350ab893a3d65 +refs/heads/master: 4c5af8e260a7a35760fe68fe5278a717f33d1be4 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c index dfd67de4f8cf..a3c0157df47d 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c @@ -4297,7 +4297,7 @@ void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend) int i_ac; struct ieee80211_tx_queue_params txq_pars; struct ieee80211_tx_queue_params *params = &txq_pars; - static struct edcf_acparam default_edcf_acparams[] = { + static const struct edcf_acparam default_edcf_acparams[] = { {EDCF_AC_BE_ACI_STA, EDCF_AC_BE_ECW_STA, cpu_to_le16(EDCF_AC_BE_TXOP_STA)}, {EDCF_AC_BK_ACI_STA, EDCF_AC_BK_ECW_STA, @@ -4307,7 +4307,7 @@ void brcms_c_edcf_setparams(struct brcms_c_info *wlc, bool suspend) {EDCF_AC_VO_ACI_STA, EDCF_AC_VO_ECW_STA, cpu_to_le16(EDCF_AC_VO_TXOP_STA)} }; /* ucode needs these parameters during its initialization */ - struct edcf_acparam *edcf_acp = &default_edcf_acparams[0]; + const struct edcf_acparam *edcf_acp = &default_edcf_acparams[0]; for (i_ac = 0; i_ac < AC_COUNT; i_ac++, edcf_acp++) { /* find out which ac this set of params applies to */