From 65d645ce43abb01fbfedae8a988b0ea1b6d55def Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Sat, 22 Mar 2014 21:20:32 +0200 Subject: [PATCH] nl80211: Fetch DFS offload capability from driver This uses a QCA vendor extension to determine if the driver supports fully offloaded DFS operations. Signed-off-by: Jouni Malinen --- src/common/qca-vendor.h | 13 ++++++++ src/drivers/driver.h | 3 +- src/drivers/driver_nl80211.c | 64 +++++++++++++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h index 0d83920a6..80bad4f89 100644 --- a/src/common/qca-vendor.h +++ b/src/common/qca-vendor.h @@ -29,12 +29,16 @@ * ranges to avoid to reduce issues due to interference or internal * co-existence information in the driver. The event data structure is * defined in struct qca_avoid_freq_list. + * + * @QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY: Command to check driver support + * for DFS offloading. */ enum qca_nl80211_vendor_subcmds { QCA_NL80211_VENDOR_SUBCMD_UNSPEC = 0, QCA_NL80211_VENDOR_SUBCMD_TEST = 1, /* subcmds 2..9 not yet allocated */ QCA_NL80211_VENDOR_SUBCMD_AVOID_FREQUENCY = 10, + QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY = 11, }; @@ -48,4 +52,13 @@ struct qca_avoid_freq_list { struct qca_avoid_freq_range range[0]; } STRUCT_PACKED; +enum qca_wlan_vendor_attr { + QCA_WLAN_VENDOR_ATTR_INVALID = 0, + /* used by QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY */ + QCA_WLAN_VENDOR_ATTR_DFS = 1, + /* keep last */ + QCA_WLAN_VENDOR_ATTR_AFTER_LAST, + QCA_WLAN_VENDOR_ATTR_MAX = QCA_WLAN_VENDOR_ATTR_AFTER_LAST - 1, +}; + #endif /* QCA_VENDOR_H */ diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 2eafc14cb..593527390 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -897,7 +897,8 @@ struct wpa_driver_capa { #define WPA_DRIVER_FLAGS_DRIVER_IE 0x00000001 /* Driver needs static WEP key setup after association command */ #define WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC 0x00000002 -/* unused: 0x00000004 */ +/* Driver takes care of all DFS operations */ +#define WPA_DRIVER_FLAGS_DFS_OFFLOAD 0x00000004 /* Driver takes care of RSN 4-way handshake internally; PMK is configured with * struct wpa_driver_ops::set_key using alg = WPA_ALG_PMK */ #define WPA_DRIVER_FLAGS_4WAY_HANDSHAKE 0x00000008 diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index dcd002e4c..c3449ac9c 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -303,6 +303,7 @@ struct wpa_driver_nl80211_data { unsigned int start_iface_up:1; unsigned int test_use_roc_tx:1; unsigned int ignore_deauth_event:1; + unsigned int dfs_vendor_cmd_avail:1; u64 remain_on_chan_cookie; u64 send_action_cookie; @@ -3725,6 +3726,10 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg) continue; } vinfo = nla_data(nl); + if (vinfo->subcmd == + QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY) + drv->dfs_vendor_cmd_avail = 1; + wpa_printf(MSG_DEBUG, "nl80211: Supported vendor command: vendor_id=0x%x subcmd=%u", vinfo->vendor_id, vinfo->subcmd); } @@ -8889,11 +8894,44 @@ done: } +static int dfs_info_handler(struct nl_msg *msg, void *arg) +{ + struct nlattr *tb[NL80211_ATTR_MAX + 1]; + struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); + int *dfs_capability_ptr = arg; + + nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), + genlmsg_attrlen(gnlh, 0), NULL); + + if (tb[NL80211_ATTR_VENDOR_DATA]) { + struct nlattr *nl_vend = tb[NL80211_ATTR_VENDOR_DATA]; + struct nlattr *tb_vendor[QCA_WLAN_VENDOR_ATTR_MAX + 1]; + + nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_MAX, + nla_data(nl_vend), nla_len(nl_vend), NULL); + + if (tb_vendor[QCA_WLAN_VENDOR_ATTR_DFS]) { + u32 val; + val = nla_get_u32(tb_vendor[QCA_WLAN_VENDOR_ATTR_DFS]); + wpa_printf(MSG_DEBUG, "nl80211: DFS offload capability: %u", + val); + *dfs_capability_ptr = val; + } + } + + return NL_SKIP; +} + + static int wpa_driver_nl80211_get_capa(void *priv, struct wpa_driver_capa *capa) { struct i802_bss *bss = priv; struct wpa_driver_nl80211_data *drv = bss->drv; + struct nl_msg *msg; + int dfs_capability = 0; + int ret = 0; + if (!drv->has_capability) return -1; os_memcpy(capa, &drv->capa, sizeof(*capa)); @@ -8909,7 +8947,31 @@ static int wpa_driver_nl80211_get_capa(void *priv, capa->flags &= ~WPA_DRIVER_FLAGS_DEDICATED_P2P_DEVICE; } - return 0; + if (drv->dfs_vendor_cmd_avail == 1) { + msg = nlmsg_alloc(); + if (!msg) + return -ENOMEM; + + nl80211_cmd(drv, msg, 0, NL80211_CMD_VENDOR); + + NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex); + NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_ID, OUI_QCA); + NLA_PUT_U32(msg, NL80211_ATTR_VENDOR_SUBCMD, + QCA_NL80211_VENDOR_SUBCMD_DFS_CAPABILITY); + + ret = send_and_recv_msgs(drv, msg, dfs_info_handler, + &dfs_capability); + if (!ret) { + if (dfs_capability) + capa->flags |= WPA_DRIVER_FLAGS_DFS_OFFLOAD; + } + } + + return ret; + + nla_put_failure: + nlmsg_free(msg); + return -ENOBUFS; }