From patchwork Mon Mar 26 17:52:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308455 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5719860325 for ; Mon, 26 Mar 2018 17:53:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A9A8295C3 for ; Mon, 26 Mar 2018 17:53:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F67C297BD; Mon, 26 Mar 2018 17:53:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4660295C3 for ; Mon, 26 Mar 2018 17:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752675AbeCZRxR (ORCPT ); Mon, 26 Mar 2018 13:53:17 -0400 Received: from mail-ot0-f193.google.com ([74.125.82.193]:34208 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751908AbeCZRxI (ORCPT ); Mon, 26 Mar 2018 13:53:08 -0400 Received: by mail-ot0-f193.google.com with SMTP id m7-v6so21598197otd.1 for ; Mon, 26 Mar 2018 10:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L0YzZq1S7wJeYrdYe/4uewHKBACdokgiEmrP08qbKiA=; b=WoI1McYn0KyBXuv6aYG4ASFDDxwfOxXMxCpFcvDRda2SrKMsMs2XarNfasAwGfKjZ+ idbM3kdZnvp6DWP7owOf94oDI6t3y3nLc1wAlEcjx8i6CzkUTJeq60OpcQ6Vbm0XLCe5 DWZp6XJRdEA27UxTlxz5ZQvzBHQS+QgcjjUecuUxnenOWfBvg98RUCRwhYwv00G9TvVG dESPv8Hn0R5NfasLkBzang81UwkKxQE4MPW7JDcuj9qGw3VCisqCJHMv8JVEVU3RlwOJ XUkUxPi9ZJK7yx6Cdv5kTEh0HayLR961Wz7O6NfOY2Sy3jB5JtJ6UBGjCaVulrKqYnLw UbPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L0YzZq1S7wJeYrdYe/4uewHKBACdokgiEmrP08qbKiA=; b=fqBf4NoSdUGTOeMVivqbSfrgPhqsA7xro7rsWHbaKf65AYfMB0eZtJKGizcdOjXlJC uO1YsGc1rDUFyGMN22fnvMybX3EcRMNL68/fE/ntCDOs7+7NPrp34BVJlvviB6tOnf+T nDJPZU0DqpKap3Eo+g8L0vlFGOqdCQUlLc7PXAfoR8anDMXmQFzg9lVSyAiDcqA7jUcr 0MWO4PaAgDEFo6EXQAOaMWU3oMo3a2M+BvPD8je1BHsI4tm8CIts+GQzvRJAyxJDcFxO q3Pk6u7NEANyp1tXG9xNPFWGbH7ikVnvQ835vRUkEy/i1nd38kqF7Xw8hjUcl6x3raVG HE3A== X-Gm-Message-State: AElRT7FwlRl4EjVZklpoiK3DhiWhxL8gRKYwKaq+dV54t3+xUOeOwo30 YsfYRC92UyHjguS9vjdv+nHWgQ== X-Google-Smtp-Source: AG47ELtRUPZXXd//LGiRvX4CaIox1PjP/AMpReTGsvbyCXYBpIBC9Q4eKWQTBGIXAXVhiFW5M5V7oA== X-Received: by 2002:a9d:3c0a:: with SMTP id q10-v6mr20480861otc.156.1522086788111; Mon, 26 Mar 2018 10:53:08 -0700 (PDT) Received: from new-host-2.home (cpe-70-114-247-242.austin.res.rr.com. [70.114.247.242]) by smtp.gmail.com with ESMTPSA id t1-v6sm9112952oth.75.2018.03.26.10.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:53:07 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [PATCH v7 10/11] mac80211: Add support for tx_control_port Date: Mon, 26 Mar 2018 12:52:50 -0500 Message-Id: <20180326175251.20666-11-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180326175251.20666-1-denkenz@gmail.com> References: <20180326175251.20666-1-denkenz@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Denis Kenzior --- net/mac80211/cfg.c | 1 + net/mac80211/ieee80211_i.h | 3 +++ net/mac80211/tx.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index fd68f6fb02d7..9294acb495ee 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3786,4 +3786,5 @@ const struct cfg80211_ops mac80211_config_ops = { .add_nan_func = ieee80211_add_nan_func, .del_nan_func = ieee80211_del_nan_func, .set_multicast_to_unicast = ieee80211_set_multicast_to_unicast, + .tx_control_port = ieee80211_tx_control_port, }; diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index ae9c33cd8ada..a52bd2a61a27 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1734,6 +1734,9 @@ void ieee80211_check_fast_xmit(struct sta_info *sta); void ieee80211_check_fast_xmit_all(struct ieee80211_local *local); void ieee80211_check_fast_xmit_iface(struct ieee80211_sub_if_data *sdata); void ieee80211_clear_fast_xmit(struct sta_info *sta); +int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, + const u8 *buf, size_t len, + const u8 *dest, __be16 proto, bool unencrypted); /* HT */ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata, diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7643178ef132..6ae8fe121500 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4749,3 +4749,49 @@ void __ieee80211_tx_skb_tid_band(struct ieee80211_sub_if_data *sdata, ieee80211_xmit(sdata, NULL, skb); local_bh_enable(); } + +int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, + const u8 *buf, size_t len, + const u8 *dest, __be16 proto, bool unencrypted) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_local *local = sdata->local; + struct sk_buff *skb; + struct ethhdr *ehdr; + u32 flags; + + /* Only accept CONTROL_PORT_PROTOCOL configured in CONNECT/ASSOCIATE + * or Pre-Authentication + */ + if (proto != sdata->control_port_protocol && + proto != cpu_to_be16(ETH_P_PREAUTH)) + return -EINVAL; + + if (unencrypted) + flags = IEEE80211_TX_INTFL_DONT_ENCRYPT; + else + flags = 0; + + skb = dev_alloc_skb(local->hw.extra_tx_headroom + + sizeof(struct ethhdr) + len); + if (!skb) + return -ENOMEM; + + skb_reserve(skb, local->hw.extra_tx_headroom + sizeof(struct ethhdr)); + + skb_put_data(skb, buf, len); + + ehdr = skb_push(skb, sizeof(struct ethhdr)); + memcpy(ehdr->h_dest, dest, ETH_ALEN); + memcpy(ehdr->h_source, sdata->vif.addr, ETH_ALEN); + ehdr->h_proto = proto; + + skb->dev = dev; + skb->protocol = htons(ETH_P_802_3); + skb_reset_network_header(skb); + skb_reset_mac_header(skb); + + __ieee80211_subif_start_xmit(skb, skb->dev, flags); + + return 0; +}