From 44363e1eaeec0f04fae4c7dc4a33b52b60e5a947 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Mon, 8 Aug 2011 15:59:04 +0200 Subject: [PATCH] --- yaml --- r: 267467 b: refs/heads/master c: 124bf340114b74eb0a9f49dd51e855fa2300b565 h: refs/heads/master i: 267465: 7513733cfc61017d3352425cc71fe702b9089adc 267463: d4e5f646b84bd1620d484da94ca21ee11e4115bd v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/channel.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d8f459358a59..e96469f0dd5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d788766c12f89ebf486101a3f9a30317c324a14b +refs/heads/master: 124bf340114b74eb0a9f49dd51e855fa2300b565 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/channel.c b/trunk/drivers/staging/brcm80211/brcmsmac/channel.c index b9cb892377ed..1aad680c7f62 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/channel.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/channel.c @@ -1279,8 +1279,8 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec, const struct country_info *country; struct brcms_band *band; const struct locale_info *li; - int conducted_max; - int conducted_ofdm_max; + int conducted_max = BRCMS_TXPWR_MAX; + int conducted_ofdm_max = BRCMS_TXPWR_MAX; const struct locale_mimo_info *li_mimo; int maxpwr20, maxpwr40; int maxpwr_idx;