From patchwork Mon Mar 26 17:16:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Kenzior X-Patchwork-Id: 10308329 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 47FBC605D2 for ; Mon, 26 Mar 2018 17:16:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37C8029162 for ; Mon, 26 Mar 2018 17:16:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C7F1297B4; Mon, 26 Mar 2018 17:16:37 +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 BE648296B1 for ; Mon, 26 Mar 2018 17:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673AbeCZRQf (ORCPT ); Mon, 26 Mar 2018 13:16:35 -0400 Received: from mail-ot0-f195.google.com ([74.125.82.195]:32951 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752654AbeCZRQd (ORCPT ); Mon, 26 Mar 2018 13:16:33 -0400 Received: by mail-ot0-f195.google.com with SMTP id 23-v6so10931781otj.0 for ; Mon, 26 Mar 2018 10:16:33 -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=YMsn8ELZk2Gej/H/3cXQHnDmRGMA32x99WfdaejHcdGgW9z8WJ/AUjwDIUmZAcRvY7 GmdBOKnZSpywFTQGJnIesoHVtHcYCrQziWAQNFXSCRUN8wbdiHa88HCv5ZZt+lIZstCy d5CWyrS6rktYiSeOEBcgMp1dl/GF0AzR4EGgMGS/yYfxytOieH7a+pTEJJiCde7vZf1E mvG+sFZ8zYdosOuH9qFjYNQQqmZhnq77Q1kBTyU98wJOqTsarl+eegll82c3QYJnQ+qy P/2lCqH7YKX+3ud93GI9KcD9hoHs0gOQUcYq22RfR/+2w4M95gMqi0X8juhmm++8lAUg ru6w== 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=hGPLUqAoNr5rz6C3QVkPF8LTsrN3MZm+mDVQkoCXGsRcONmBfhZzLH5gYLIWWaKf9v 7CXjn5onP1s6BwxGsYlYzGsDwgr88FMeg8aILriXmgECoxnDaPiNXHzb9R6pbhr7qcFJ +DWtiqOb83QISixpw5mqUpoI2O+BFSUrvmX4REit0jHUnF/rtyQ+PTN05QDMHpSO3t5G JH2uIxCuAAJ6TIkDlag9ZguJnLoAIzyjyAZVoUXAkeCA6e4Ou9bajq+1btVtRSC+gg+u r9VW7OyCj+N8+vcAxYNZ++b/PnMoAcdpzFA4zHbGzb2MFoybSfsVMZanMBjBLpYGnqbu 1WgA== X-Gm-Message-State: AElRT7EJ+6w3yzE/5ThS5+zkUihLjOcPA4dKDJjah8s/UUUxLjppVHE9 F1n7OmzTO2ZU6/b0rKyLq8pZFQ== X-Google-Smtp-Source: AG47ELt3X7OAyyOMQQoMhve9a7u5DLs2PTOJPt8TPg96XIV57m5ou2lbbTd2cjqdcMdi7AaVWjntMA== X-Received: by 2002:a9d:b82:: with SMTP id 2-v6mr24811940oth.40.1522084592498; Mon, 26 Mar 2018 10:16:32 -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 c3-v6sm9426996otk.8.2018.03.26.10.16.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Mar 2018 10:16:31 -0700 (PDT) From: Denis Kenzior To: linux-wireless@vger.kernel.org Cc: Denis Kenzior Subject: [RFC v6 10/11] mac80211: Add support for tx_control_port Date: Mon, 26 Mar 2018 12:16:13 -0500 Message-Id: <20180326171614.20373-11-denkenz@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180326171614.20373-1-denkenz@gmail.com> References: <20180326171614.20373-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; +}