From patchwork Thu Aug 9 18:04:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 955750 X-Patchwork-Delegate: linville@tuxdriver.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="B/xTBwBT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41mbk14vQNz9ryt for ; Fri, 10 Aug 2018 04:04:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727140AbeHIUaW (ORCPT ); Thu, 9 Aug 2018 16:30:22 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39090 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727025AbeHIUaV (ORCPT ); Thu, 9 Aug 2018 16:30:21 -0400 Received: by mail-pg1-f193.google.com with SMTP id a11-v6so3106737pgw.6 for ; Thu, 09 Aug 2018 11:04:23 -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=LDax2ysBViXmLzthadB9RiexbVfXXsqrqFybPfUGcTY=; b=B/xTBwBTA8WlkeuBt4TJTPO1SCkWY15xuBNPSDmna8oTWq9+vBH7KtAnSMNyvWcv/z iTwNaDhApTBIMlP5R6so0Wx58af/DR8XjvVC1YbRLTH7XuCDjf2pQM8KhKOR4p0ZEOa8 bMJYhHImeagEEnsC7MKD0jk/l9VVxksY8tACuyEza/JLgoqOp9wxdCquxO+wGQpZ2LZw hwtyFdPG+6KCk+q/QgH8VgQ3E8OuZl8UxKdmhvc7Yz2G1D6TExw+yzJ70kQQgHSez4p7 xi/N+DbGZVMls0AbpDhA3Y0NX44TR34V2vAKEcmEiu2reXfKLk9KvXRonEapzVcAeBPu EouA== 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=LDax2ysBViXmLzthadB9RiexbVfXXsqrqFybPfUGcTY=; b=Y/zW0AacXVDxzkOT/9i5TXflQhnw/6BRBcsEhG8U9aVYrTIKpex1dzp1p58tgxzbiz fMjCJhMtdlEdPsrw6IEpwi/GRz7wzPgAWI0lPzuxaeVdrBC1M79BARwByw2xJJCztkDT I3sGK56Aw3Goxj/Naf6755uL3D/cZAObPwYbQA922cMeAwJXapT+aO0jnZpLcuXhGs95 rnecdTv9k09OuNZvbU/D3c9YuelYxAyb3569OgfFpk2wJGxycL22qsIyVfijljoPiqXE NE+JvHPYb8ckB6g0yj6IlUkVSo4TqgZJqYP85J66lwDiJARREmDKDQUz8SjZgF/ng9wn yAEw== X-Gm-Message-State: AOUpUlHbUR69BP65sji3AQJTmBOdK5L/MaD1DjxQ7bbh1JpvU9vk90IS SlW5pPA80XAaMBrb4LsNWGzv5m+d X-Google-Smtp-Source: AA+uWPzPrJHprYe5MB+m0h3hoqM9so+SvsTc+iXRn3GE+4mHNLj5on59EoasYN3s1KI1/2wD+PIzMA== X-Received: by 2002:a63:82c7:: with SMTP id w190-v6mr3110000pgd.253.1533837862352; Thu, 09 Aug 2018 11:04:22 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id n24-v6sm13623779pfi.161.2018.08.09.11.04.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 11:04:21 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org, linville@tuxdriver.com Cc: davem@davemloft.net, andrew@lunn.ch, Florian Fainelli Subject: [PATCH ethtool v2 1/3] ethtool-copy.h: sync with net-next Date: Thu, 9 Aug 2018 11:04:00 -0700 Message-Id: <20180809180402.19430-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180809180402.19430-1-f.fainelli@gmail.com> References: <20180809180402.19430-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This covers kernel changes up to commit 6cfef793b558: ethtool: Add WAKE_FILTER and RX_CLS_FLOW_WAKE Signed-off-by: Florian Fainelli --- ethtool-copy.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ethtool-copy.h b/ethtool-copy.h index 8cc61e9ab40b..6bfbb85f9402 100644 --- a/ethtool-copy.h +++ b/ethtool-copy.h @@ -215,12 +215,16 @@ struct ethtool_value { __u32 data; }; +#define PFC_STORM_PREVENTION_AUTO 0xffff +#define PFC_STORM_PREVENTION_DISABLE 0 + enum tunable_id { ETHTOOL_ID_UNSPEC, ETHTOOL_RX_COPYBREAK, ETHTOOL_TX_COPYBREAK, + ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */ /* - * Add your fresh new tubale attribute above and remember to update + * Add your fresh new tunable attribute above and remember to update * tunable_strings[] in net/core/ethtool.c */ __ETHTOOL_TUNABLE_COUNT, @@ -864,7 +868,8 @@ struct ethtool_flow_ext { * includes the %FLOW_EXT or %FLOW_MAC_EXT flag * (see &struct ethtool_flow_ext description). * @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC - * if packets should be discarded + * if packets should be discarded, or %RX_CLS_FLOW_WAKE if the + * packets should be used for Wake-on-LAN with %WAKE_FILTER * @location: Location of rule in the table. Locations must be * numbered such that a flow matching multiple rules will be * classified according to the first (lowest numbered) rule. @@ -896,13 +901,13 @@ struct ethtool_rx_flow_spec { static __inline__ __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie) { return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie; -}; +} static __inline__ __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie) { return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >> ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF; -}; +} /** * struct ethtool_rxnfc - command to get or set RX flow classification rules @@ -1628,6 +1633,7 @@ static __inline__ int ethtool_validate_duplex(__u8 duplex) #define WAKE_ARP (1 << 4) #define WAKE_MAGIC (1 << 5) #define WAKE_MAGICSECURE (1 << 6) /* only meaningful if WAKE_MAGIC */ +#define WAKE_FILTER (1 << 7) /* L2-L4 network traffic flow types */ #define TCP_V4_FLOW 0x01 /* hash or spec (tcp_ip4_spec) */ @@ -1665,6 +1671,7 @@ static __inline__ int ethtool_validate_duplex(__u8 duplex) #define RXH_DISCARD (1 << 31) #define RX_CLS_FLOW_DISC 0xffffffffffffffffULL +#define RX_CLS_FLOW_WAKE 0xfffffffffffffffeULL /* Special RX classification rule insert location values */ #define RX_CLS_LOC_SPECIAL 0x80000000 /* flag */