Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/cfg80211.c

6 files changed, 25 insertions, 63 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index f00d377343d9..fd7dbd4609df 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2650,35 +2650,6 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif,
         return 0;
 }
 
-static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,
-                              struct ieee80211_channel *chan,
-                              enum nl80211_channel_type channel_type)
-{
-        struct ath6kl_vif *vif;
-
-        /*
-         * 'dev' could be NULL if a channel change is required for the hardware
-         * device itself, instead of a particular VIF.
-         *
-         * FIXME: To be handled properly when monitor mode is supported.
-         */
-        if (!dev)
-                return -EBUSY;
-
-        vif = netdev_priv(dev);
-
-        if (!ath6kl_cfg80211_ready(vif))
-                return -EIO;
-
-        ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",
-                   __func__, chan->center_freq, chan->hw_value);
-        vif->next_chan = chan->center_freq;
-        vif->next_ch_type = channel_type;
-        vif->next_ch_band = chan->band;
-
-        return 0;
-}
-
 void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable)
 {
         int err;
@@ -2886,7 +2857,7 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
         p.ssid_len = vif->ssid_len;
         memcpy(p.ssid, vif->ssid, vif->ssid_len);
         p.dot11_auth_mode = vif->dot11_auth_mode;
-        p.ch = cpu_to_le16(vif->next_chan);
+        p.ch = cpu_to_le16(info->channel->center_freq);
 
         /* Enable uAPSD support by default */
         res = ath6kl_wmi_ap_set_apsd(ar->wmi, vif->fw_vif_idx, true);
@@ -2910,8 +2881,8 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
                         return res;
         }
 
-        if (ath6kl_set_htcap(vif, vif->next_ch_band,
-                             vif->next_ch_type != NL80211_CHAN_NO_HT))
+        if (ath6kl_set_htcap(vif, info->channel->band,
+                             info->channel_type != NL80211_CHAN_NO_HT))
                 return -EIO;
 
         /*
@@ -3392,7 +3363,6 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
         .suspend = __ath6kl_cfg80211_suspend,
         .resume = __ath6kl_cfg80211_resume,
 #endif
-        .set_channel = ath6kl_set_channel,
         .start_ap = ath6kl_start_ap,
         .change_beacon = ath6kl_change_beacon,
         .stop_ap = ath6kl_stop_ap,
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index b3eee10cf016..d38a31de344c 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -577,9 +577,6 @@ struct ath6kl_vif {
         u32 last_cancel_roc_id;
         u32 send_action_id;
         bool probe_req_report;
-        u16 next_chan;
-        enum nl80211_channel_type next_ch_type;
-        enum ieee80211_band next_ch_band;
         u16 assoc_bss_beacon_int;
         u16 listen_intvl_t;
         u16 bmiss_time_t;
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index ced6c6fe5470..15cfe30e54fd 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -217,12 +217,6 @@ void dump_cred_dist_stats(struct htc_target *target)
                    target->credit_info->cur_free_credits);
 }
 
-static int ath6kl_debugfs_open(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 void ath6kl_debug_war(struct ath6kl *ar, enum ath6kl_war war)
 {
         switch (war) {
@@ -263,7 +257,7 @@ static ssize_t read_file_war_stats(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_war_stats = {
         .read = read_file_war_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -490,7 +484,7 @@ static ssize_t ath6kl_fwlog_mask_write(struct file *file,
 }
 
 static const struct file_operations fops_fwlog_mask = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .read = ath6kl_fwlog_mask_read,
         .write = ath6kl_fwlog_mask_write,
         .owner = THIS_MODULE,
@@ -642,7 +636,7 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_tgt_stats = {
         .read = read_file_tgt_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -707,7 +701,7 @@ static ssize_t read_file_credit_dist_stats(struct file *file,
 
 static const struct file_operations fops_credit_dist_stats = {
         .read = read_file_credit_dist_stats,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -810,7 +804,7 @@ static ssize_t ath6kl_endpoint_stats_write(struct file *file,
 }
 
 static const struct file_operations fops_endpoint_stats = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .read = ath6kl_endpoint_stats_read,
         .write = ath6kl_endpoint_stats_write,
         .owner = THIS_MODULE,
@@ -883,7 +877,7 @@ static ssize_t ath6kl_regread_write(struct file *file,
 static const struct file_operations fops_diag_reg_read = {
         .read = ath6kl_regread_read,
         .write = ath6kl_regread_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1007,7 +1001,7 @@ static ssize_t ath6kl_lrssi_roam_read(struct file *file,
 static const struct file_operations fops_lrssi_roam_threshold = {
         .read = ath6kl_lrssi_roam_read,
         .write = ath6kl_lrssi_roam_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1069,7 +1063,7 @@ static ssize_t ath6kl_regwrite_write(struct file *file,
 static const struct file_operations fops_diag_reg_write = {
         .read = ath6kl_regwrite_read,
         .write = ath6kl_regwrite_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1174,7 +1168,7 @@ static ssize_t ath6kl_roam_table_read(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_roam_table = {
         .read = ath6kl_roam_table_read,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1212,7 +1206,7 @@ static ssize_t ath6kl_force_roam_write(struct file *file,
 
 static const struct file_operations fops_force_roam = {
         .write = ath6kl_force_roam_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1252,7 +1246,7 @@ static ssize_t ath6kl_roam_mode_write(struct file *file,
 
 static const struct file_operations fops_roam_mode = {
         .write = ath6kl_roam_mode_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1294,7 +1288,7 @@ static ssize_t ath6kl_keepalive_write(struct file *file,
 }
 
 static const struct file_operations fops_keepalive = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .read = ath6kl_keepalive_read,
         .write = ath6kl_keepalive_write,
         .owner = THIS_MODULE,
@@ -1339,7 +1333,7 @@ static ssize_t ath6kl_disconnect_timeout_write(struct file *file,
 }
 
 static const struct file_operations fops_disconnect_timeout = {
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .read = ath6kl_disconnect_timeout_read,
         .write = ath6kl_disconnect_timeout_write,
         .owner = THIS_MODULE,
@@ -1520,7 +1514,7 @@ static ssize_t ath6kl_create_qos_write(struct file *file,
 
 static const struct file_operations fops_create_qos = {
         .write = ath6kl_create_qos_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1568,7 +1562,7 @@ static ssize_t ath6kl_delete_qos_write(struct file *file,
 
 static const struct file_operations fops_delete_qos = {
         .write = ath6kl_delete_qos_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1608,7 +1602,7 @@ static ssize_t ath6kl_bgscan_int_write(struct file *file,
 
 static const struct file_operations fops_bgscan_int = {
         .write = ath6kl_bgscan_int_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1666,7 +1660,7 @@ static ssize_t ath6kl_listen_int_read(struct file *file,
 static const struct file_operations fops_listen_int = {
         .read = ath6kl_listen_int_read,
         .write = ath6kl_listen_int_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
@@ -1726,7 +1720,7 @@ static ssize_t ath6kl_power_params_write(struct file *file,
 
 static const struct file_operations fops_power_params = {
         .write = ath6kl_power_params_write,
-        .open = ath6kl_debugfs_open,
+        .open = simple_open,
         .owner = THIS_MODULE,
         .llseek = default_llseek,
 };
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 45621baca24a..c189e28e86a9 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -602,7 +602,6 @@ static int ath6kl_commit_ch_switch(struct ath6kl_vif *vif, u16 channel)
 
         struct ath6kl *ar = vif->ar;
 
-        vif->next_chan = channel;
         vif->profile.ch = cpu_to_le16(channel);
 
         switch (vif->nw_type) {
diff --git a/drivers/net/wireless/ath/ath6kl/testmode.c b/drivers/net/wireless/ath/ath6kl/testmode.c
index 6675c92b542b..acc9aa832f76 100644
--- a/drivers/net/wireless/ath/ath6kl/testmode.c
+++ b/drivers/net/wireless/ath/ath6kl/testmode.c
@@ -55,8 +55,9 @@ void ath6kl_tm_rx_event(struct ath6kl *ar, void *buf, size_t buf_len)
                 ath6kl_warn("failed to allocate testmode rx skb!\n");
                 return;
         }
-        NLA_PUT_U32(skb, ATH6KL_TM_ATTR_CMD, ATH6KL_TM_CMD_TCMD);
-        NLA_PUT(skb, ATH6KL_TM_ATTR_DATA, buf_len, buf);
+        if (nla_put_u32(skb, ATH6KL_TM_ATTR_CMD, ATH6KL_TM_CMD_TCMD) ||
+            nla_put(skb, ATH6KL_TM_ATTR_DATA, buf_len, buf))
+                goto nla_put_failure;
         cfg80211_testmode_event(skb, GFP_KERNEL);
         return;
 
diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c
index dfbbe9e7ff75..3740c3d6ab88 100644
--- a/drivers/net/wireless/ath/ath6kl/usb.c
+++ b/drivers/net/wireless/ath/ath6kl/usb.c
@@ -1191,6 +1191,7 @@ static struct usb_driver ath6kl_usb_driver = {
         .disconnect = ath6kl_usb_remove,
         .id_table = ath6kl_usb_ids,
         .supports_autosuspend = true,
+        .disable_hub_initiated_lpm = 1,
 };
 
 static int ath6kl_usb_init(void)