Commit da29d2a5 authored by Marco Porsch's avatar Marco Porsch Committed by Johannes Berg
Browse files

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: default avatarMarco Porsch <marco.porsch@etit.tu-chemnitz.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 246dc3fd

net/wireless/mesh.c

+2 −1
Original line number Diff line number Diff line
@@ -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))