Merge branch 'for-3.8/drivers' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / net / wireless / mesh.c

diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index 12b5a570a30690015160c9d09a0ecee1ef2f2fe1..f9d6ce5cfabbaebfc202f2d0290d8b1f0fbbc314 100644 (file)
--- 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._type = NL80211_CHAN_NO_HT;
+               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))
@@ -198,7 +199,7 @@ int cfg80211_set_mesh_channel(struct cfg80211_registered_device *rdev,
         * compatible with 802.11 mesh.
         */
        if (rdev->ops->libertas_set_mesh_channel) {
-               if (chandef->_type != NL80211_CHAN_NO_HT)
+               if (chandef->width != NL80211_CHAN_WIDTH_20_NOHT)
                        return -EINVAL;
 
                if (!netif_running(wdev->netdev))