From: Marco Porsch <marco.porsch@etit.tu-chemnitz.de>
Date: Mon, 3 Dec 2012 10:23:37 +0000 (+0100)
Subject: cfg80211: fix channel error on mesh join
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=da29d2a5780d80857773d7776b7603a449b0b6e0;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index 3ee5a728228..f9d6ce5cfab 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))