Skip to content

Commit

Permalink
cfg80211: fix channel error on mesh join
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marco Porsch authored and jmberg-intel committed Dec 3, 2012
1 parent 246dc3f commit da29d2a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/wireless/mesh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit da29d2a

Please sign in to comment.