Commit 45ad26e4 authored Aug 04, 2018 by Florian Fainelli Committed by Greg Kroah-Hartman Sep 19, 2018

ethtool: Remove trailing semicolon for static inline



[ Upstream commit d89d41556141a527030a15233135ba622ba3350d ]

Android's header sanitization tool chokes on static inline functions having a
trailing semicolon, leading to an incorrectly parsed header file. While the
tool should obviously be fixed, also fix the header files for the two affected
functions: ethtool_get_flow_spec_ring() and ethtool_get_flow_spec_ring_vf().

Fixes: 8cf6f497 ("ethtool: Add helper routines to pass vf to rx_flow_spec")
Reporetd-by: Blair Prescott <blair.prescott@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ebce88a8

include/uapi/linux/ethtool.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -882,13 +882,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