]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ath6kl: Implement remain_on_channel and cancel_remain_on_channel
authorJouni Malinen <jouni@qca.qualcomm.com>
Tue, 30 Aug 2011 18:57:55 +0000 (21:57 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Wed, 31 Aug 2011 07:13:00 +0000 (10:13 +0300)
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath6kl/cfg80211.c

index f7176d203be085dfa76fb6e3a9462dd31af63162..6745bf203ec5009a4c16935a98dd87d190e9cd7a 100644 (file)
@@ -1658,6 +1658,35 @@ static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev,
                                      0);
 }
 
+static int ath6kl_remain_on_channel(struct wiphy *wiphy,
+                                   struct net_device *dev,
+                                   struct ieee80211_channel *chan,
+                                   enum nl80211_channel_type channel_type,
+                                   unsigned int duration,
+                                   u64 *cookie)
+{
+       struct ath6kl *ar = ath6kl_priv(dev);
+
+       /* TODO: if already pending or ongoing remain-on-channel,
+        * return -EBUSY */
+       *cookie = 1; /* only a single pending request is supported */
+
+       return ath6kl_wmi_remain_on_chnl_cmd(ar->wmi, chan->center_freq,
+                                            duration);
+}
+
+static int ath6kl_cancel_remain_on_channel(struct wiphy *wiphy,
+                                          struct net_device *dev,
+                                          u64 cookie)
+{
+       struct ath6kl *ar = ath6kl_priv(dev);
+
+       if (cookie != 1)
+               return -ENOENT;
+
+       return ath6kl_wmi_cancel_remain_on_chnl_cmd(ar->wmi);
+}
+
 static struct cfg80211_ops ath6kl_cfg80211_ops = {
        .change_virtual_intf = ath6kl_cfg80211_change_iface,
        .scan = ath6kl_cfg80211_scan,
@@ -1685,6 +1714,8 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
        .set_beacon = ath6kl_set_beacon,
        .del_beacon = ath6kl_del_beacon,
        .change_station = ath6kl_change_station,
+       .remain_on_channel = ath6kl_remain_on_channel,
+       .cancel_remain_on_channel = ath6kl_cancel_remain_on_channel,
 };
 
 struct wireless_dev *ath6kl_cfg80211_init(struct device *dev)
@@ -1706,6 +1737,8 @@ struct wireless_dev *ath6kl_cfg80211_init(struct device *dev)
                return NULL;
        }
 
+       wdev->wiphy->max_remain_on_channel_duration = 5000;
+
        /* set device pointer for wiphy */
        set_wiphy_dev(wdev->wiphy, dev);