Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

3 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 9ba85106eec0..b3879fbf5368 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -402,7 +402,7 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)
         struct p54_rssi_db_entry *rssi_data;
         unsigned int i;
         void *entry;
-        __le16 freq = cpu_to_le16(priv->hw->conf.channel->center_freq);
+        __le16 freq = cpu_to_le16(priv->hw->conf.chandef.chan->center_freq);
 
         skb = p54_alloc_skb(priv, P54_HDR_FLAG_CONTROL_OPSET, sizeof(*head) +
                             2 + sizeof(*iq_autocal) + sizeof(*body) +
@@ -532,7 +532,7 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)
 err:
         wiphy_err(priv->hw->wiphy, "frequency change to channel %d failed.\n",
                   ieee80211_frequency_to_channel(
-                          priv->hw->conf.channel->center_freq));
+                          priv->hw->conf.chandef.chan->center_freq));
 
         dev_kfree_skb_any(skb);
         return -EINVAL;
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index ee654a691f38..067e6f2fd050 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -340,7 +340,7 @@ static int p54_config(struct ieee80211_hw *dev, u32 changed)
                  * TODO: Use the LM_SCAN_TRAP to determine the current
                  * operating channel.
                  */
-                priv->curchan = priv->hw->conf.channel;
+                priv->curchan = priv->hw->conf.chandef.chan;
                 p54_reset_stats(priv);
                 WARN_ON(p54_fetch_statistics(priv));
         }
@@ -480,7 +480,7 @@ static void p54_bss_info_changed(struct ieee80211_hw *dev,
                 p54_set_edcf(priv);
         }
         if (changed & BSS_CHANGED_BASIC_RATES) {
-                if (dev->conf.channel->band == IEEE80211_BAND_5GHZ)
+                if (dev->conf.chandef.chan->band == IEEE80211_BAND_5GHZ)
                         priv->basic_rate_mask = (info->basic_rates << 4);
                 else
                         priv->basic_rate_mask = info->basic_rates;
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index 12f0a34477f2..f95de0d16216 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -354,13 +354,13 @@ static int p54_rx_data(struct p54_common *priv, struct sk_buff *skb)
         rx_status->signal = p54_rssi_to_dbm(priv, hdr->rssi);
         if (hdr->rate & 0x10)
                 rx_status->flag |= RX_FLAG_SHORTPRE;
-        if (priv->hw->conf.channel->band == IEEE80211_BAND_5GHZ)
+        if (priv->hw->conf.chandef.chan->band == IEEE80211_BAND_5GHZ)
                 rx_status->rate_idx = (rate < 4) ? 0 : rate - 4;
         else
                 rx_status->rate_idx = rate;
 
         rx_status->freq = freq;
-        rx_status->band =  priv->hw->conf.channel->band;
+        rx_status->band =  priv->hw->conf.chandef.chan->band;
         rx_status->antenna = hdr->antenna;
 
         tsf32 = le32_to_cpu(hdr->tsf32);