From patchwork Thu Sep 17 14:32:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 7208001 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 861BABEEC1 for ; Thu, 17 Sep 2015 14:33:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 590ED20805 for ; Thu, 17 Sep 2015 14:33:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F1112063E for ; Thu, 17 Sep 2015 14:33:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751581AbbIQOdm (ORCPT ); Thu, 17 Sep 2015 10:33:42 -0400 Received: from mga01.intel.com ([192.55.52.88]:6821 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751387AbbIQOdh (ORCPT ); Thu, 17 Sep 2015 10:33:37 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 17 Sep 2015 07:33:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,547,1437462000"; d="scan'208";a="791759240" Received: from aotchere-mobl1.ger.corp.intel.com ([10.12.85.62]) by fmsmga001.fm.intel.com with ESMTP; 17 Sep 2015 07:33:36 -0700 From: andrei.otcheretianski@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, emmanuel.grumbach@intel.com, Andrei Otcheretianski Subject: [RFC 5/7] cfg80211: provide a function to report a match for NAN Date: Thu, 17 Sep 2015 17:32:29 +0300 Message-Id: <1442500351-8780-6-git-send-email-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.5.2.windows.2 In-Reply-To: <1442500351-8780-1-git-send-email-andrei.otcheretianski@intel.com> References: <1442500351-8780-1-git-send-email-andrei.otcheretianski@intel.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Emmanuel Grumbach Provide a function the driver can call to report a match. This will send the event to the user space. Signed-off-by: Emmanuel Grumbach Signed-off-by: Andrei Otcheretianski --- include/net/cfg80211.h | 24 +++++++++++++ include/uapi/linux/nl80211.h | 37 ++++++++++++++++++++ net/wireless/nl80211.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 65970e3..34f6135 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -5347,6 +5347,30 @@ wiphy_ext_feature_isset(struct wiphy *wiphy, return (ft_byte & BIT(ftidx % 8)) != 0; } +/** + * cfg80211_nan_match - report a match for a NAN function. + * @wdev: the wireless device reporting the match + * @type: the type of the function that had a match. If it is + * %NL80211_NAN_FUNC_SUBSCRIBE it means that we heard a publisher. + * If it is %NL80211_NAN_FUNC_PUBLISH, it means that we replied to + * an active subscriber with a solicited publish. + * If it is %NL80211_NAN_FUNC_FOLLOW_UP, we received a follow up. + * @inst_id: the local instance id + * @peer_inst_id: the instance id of the peer's function + * @addr: the MAC address of the peer + * @info: the Service Specific Info from the peer (if any) + * @info_len: the length of the &info + * @gfp: allocation flags + * + * This function reports that the a NAN function had a match. This + * can be a subscribe that had a match or a solicited publish that + * was sent. It can also be a follow up that was received. + */ +void cfg80211_nan_match(struct wireless_dev *wdev, + enum nl80211_nan_function_type type, + u8 inst_id, u8 peer_inst_id, const u8 *addr, + const u8 *info, u8 info_len, gfp_t gfp); + /* ethtool helper */ void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index dbc5631..bac369e 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -830,6 +830,8 @@ * should be opeartional (%NL80211_CMD_START_NAN was executed). * It must contain at least one of the following attributes: * %NL80211_ATTR_NAN_MASTER_PREF, %NL80211_ATTR_NAN_DUAL. + * @NL80211_CMD_NAN_FUNC_MATCH: Notification sent when a match is reported. + * This will contain a %NL80211_ATTR_NAN_MATCH nested attribute. * * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use @@ -1022,6 +1024,7 @@ enum nl80211_commands { NL80211_CMD_ADD_NAN_FUNCTION, NL80211_CMD_RM_NAN_FUNCTION, NL80211_CMD_CHANGE_NAN_CONFIG, + NL80211_CMD_NAN_MATCH, /* add new commands above here */ @@ -1800,6 +1803,8 @@ enum nl80211_commands { * attribute. * @NL80211_ATTR_NAN_FUNC_INST_ID: the instance id of a %NL80211_ATTR_NAN_FUNC. * Its type is u8 and it cannot be 0. + * @NL80211_ATTR_NAN_MATCH: used to report a match. This is a nested attribute. + * See &enum nl80211_nan_match_attributes. * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined @@ -2175,6 +2180,7 @@ enum nl80211_attrs { NL80211_ATTR_NAN_DUAL, NL80211_ATTR_NAN_FUNC, NL80211_ATTR_NAN_FUNC_INST_ID, + NL80211_ATTR_NAN_MATCH, /* add attributes here, update the policy in nl80211.c */ @@ -4760,4 +4766,35 @@ enum nl80211_nan_srf_attributes { NL80211_NAN_SRF_ATTR_MAX = NUM_NL80211_NAN_SRF_ATTR - 1, }; +/** + * enum nl80211_nan_match_attributes - NAN match attributes + * @__NL80211_NAN_MATCH_INVALID: invalid + * @NL80211_NAN_MATCH_FUNC_TYPE: &enum nl80211_nan_function_type (u8). This is + * the type of the function which had a match. + * @NL80211_NAN_MATCH_INSTANCE_ID: The instance ID of the local function that + * had a match. This is a u8. + * @NL80211_NAN_MATCH_PEER_INSTANCE_ID: The instance ID of the peer's function + * that caused the match. This is a u8. + * specified in NAN spec. This is a binary attribute. + * @NL80211_NAN_MATCH_MAC: The MAC address of the peer. This attribute is + * binary. + * @NL80211_NAN_MATCH_SERVICE_INFO: array of bytes describing the peer's + * service specific info. This is a binary attribute. + * + * @NUM_NL80211_NAN_MATCH_ATTR: internal + * @NL80211_NAN_MATCH_ATTR_MAX: highest NAN match attribute + */ +enum nl80211_nan_match_attributes { + __NL80211_NAN_MATCH_INVALID, + NL80211_NAN_MATCH_FUNC_TYPE, + NL80211_NAN_MATCH_INSTANCE_ID, + NL80211_NAN_MATCH_PEER_INSTANCE_ID, + NL80211_NAN_MATCH_MAC, + NL80211_NAN_MATCH_SERVICE_INFO, + + /* keep last */ + NUM_NL80211_NAN_MATCH_ATTR, + NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_FUNC_ATTR - 1 +}; + #endif /* __LINUX_NL80211_H */ diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 7e32844..dd02acf 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -505,6 +505,20 @@ nl80211_nan_func_policy[NL80211_NAN_FUNC_ATTR_MAX + 1] = { [NL80211_NAN_FUNC_TX_MATCH_FILTER] = { .type = NLA_NESTED }, }; +/* policy for NAN match attributes */ +static const struct nla_policy +nl80211_nan_match_policy[NL80211_NAN_MATCH_ATTR_MAX + 1] = { + [NL80211_NAN_MATCH_FUNC_TYPE] = { .type = NLA_U8 }, + [NL80211_NAN_MATCH_INSTANCE_ID] = { .type = NLA_U8 }, + [NL80211_NAN_MATCH_PEER_INSTANCE_ID] = { .type = NLA_U8 }, + [NL80211_NAN_MATCH_MAC] = { .type = NLA_BINARY, .len = ETH_ALEN }, + [NL80211_NAN_MATCH_SERVICE_INFO] = { + .type = NLA_BINARY, + .len = NL80211_NAN_FUNC_SERVICE_SPEC_INFO_MAX_LEN + }, + +}; + /* policy for Service Response Filter attributes */ static const struct nla_policy nl80211_nan_srf_policy[NL80211_NAN_SRF_ATTR_MAX + 1] = { @@ -10191,6 +10205,74 @@ static int nl80211_nan_change_config(struct sk_buff *skb, return rdev_nan_change_conf(rdev, wdev, &conf, changed); } +static void +nl80211_send_nan_match(struct cfg80211_registered_device *rdev, + struct wireless_dev *wdev, + enum nl80211_nan_function_type type, + u8 inst_id, u8 peer_inst_id, const u8 *addr, + const u8 *info, u8 info_len, gfp_t gfp) +{ + struct nlattr *match; + struct sk_buff *msg; + void *hdr; + + if (WARN_ON(!inst_id || !peer_inst_id || !addr)) + return; + + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); + if (!msg) + return; + + hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_NAN_MATCH); + if (!hdr) { + nlmsg_free(msg); + return; + } + + if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) || + (wdev->netdev && nla_put_u32(msg, NL80211_ATTR_IFINDEX, + wdev->netdev->ifindex)) || + nla_put_u64(msg, NL80211_ATTR_WDEV, wdev_id(wdev))) + goto nla_put_failure; + + match = nla_nest_start(msg, NL80211_ATTR_NAN_MATCH); + if (!match) + goto nla_put_failure; + + if (nla_put_u8(msg, NL80211_NAN_MATCH_FUNC_TYPE, type) || + nla_put_u8(msg, NL80211_NAN_MATCH_INSTANCE_ID, inst_id) || + nla_put_u8(msg, NL80211_NAN_MATCH_PEER_INSTANCE_ID, peer_inst_id) || + nla_put(msg, NL80211_NAN_MATCH_MAC, ETH_ALEN, addr)) + goto nla_put_failure; + + if (info && info_len && + nla_put(msg, NL80211_NAN_MATCH_SERVICE_INFO, info_len, info)) + goto nla_put_failure; + + genlmsg_end(msg, hdr); + + genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0, + NL80211_MCGRP_MLME, gfp); + return; + +nla_put_failure: + genlmsg_cancel(msg, hdr); + nlmsg_free(msg); +} + +void cfg80211_nan_match(struct wireless_dev *wdev, + enum nl80211_nan_function_type type, + u8 inst_id, u8 peer_inst_id, const u8 *addr, + const u8 *info, u8 info_len, gfp_t gfp) +{ + struct wiphy *wiphy = wdev->wiphy; + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + + nl80211_send_nan_match(rdev, wdev, type, inst_id, peer_inst_id, addr, + info, info_len, gfp); +} +EXPORT_SYMBOL(cfg80211_nan_match); + static int nl80211_get_protocol_features(struct sk_buff *skb, struct genl_info *info) {