diff options
| author | Marco Porsch <marco.porsch@etit.tu-chemnitz.de> | 2012-12-03 11:23:37 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-12-03 11:24:49 +0100 |
| commit | da29d2a5780d80857773d7776b7603a449b0b6e0 (patch) | |
| tree | 10433b1fbab3c9806d2016d822e3d68266fbf701 /net/wireless/mesh.c | |
| parent | mac80211: return if CSA is not handle (diff) | |
| download | linux-da29d2a5780d80857773d7776b7603a449b0b6e0.tar.xz linux-da29d2a5780d80857773d7776b7603a449b0b6e0.zip | |
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>
Diffstat (limited to 'net/wireless/mesh.c')
| -rw-r--r-- | net/wireless/mesh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c index 3ee5a7282283..f9d6ce5cfabb 100644 --- a/net/wireless/mesh.c +++ b/net/wireless/mesh.c @@ -146,7 +146,8 @@ int __cfg80211_join_mesh(struct cfg80211_registered_device *rdev, if (!setup->chandef.chan) return -EINVAL; - setup->chandef.width = NL80211_CHAN_WIDTH_20_NOHT;; + setup->chandef.width = NL80211_CHAN_WIDTH_20_NOHT; + setup->chandef.center_freq1 = setup->chandef.chan->center_freq; } if (!cfg80211_reg_can_beacon(&rdev->wiphy, &setup->chandef)) |