diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-07 13:03:50 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-07 13:03:50 -0500 |
| commit | 8024dc191025d6b981563236df02da5c0db0854d (patch) | |
| tree | f42cd84995c804c3590c56616527f5399155060b /net/wireless/mesh.c | |
| parent | fd3065b25b69ce345073bbd294a73343a608fd8b (diff) | |
| parent | 9e2ff36beae4bedbad2a69d458f9404f35fcb528 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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 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)) |