Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit da29d2a5780d80857773d7776b7603a449b0b6e0

Authored by Marco Porsch
Committed by Johannes Berg
1 parent 246dc3fddf
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

cfg80211: fix channel error on mesh join 

Fix an error on mesh join when no channel has been
explicitly set beforehand.

Also remove a double semicolon.

Signed-off-by: Marco Porsch <marco.porsch@etit.tu-chemnitz.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -146,7 +146,8 @@
146 146 if (!setup->chandef.chan)
147 147 return -EINVAL;
148 148  
149   - setup->chandef.width = NL80211_CHAN_WIDTH_20_NOHT;;
  149 + setup->chandef.width = NL80211_CHAN_WIDTH_20_NOHT;
  150 + setup->chandef.center_freq1 = setup->chandef.chan->center_freq;
150 151 }
151 152  
152 153 if (!cfg80211_reg_can_beacon(&rdev->wiphy, &setup->chandef))