Commit 01b6617c authored by Florian Fainelli's avatar Florian Fainelli Committed by Kleber Sacilotto de Souza

ethtool: Remove trailing semicolon for static inline

BugLink: https://bugs.launchpad.net/bugs/1798539

[ Upstream commit d89d4155 ]

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: default avatarBlair Prescott <blair.prescott@broadcom.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent d61c9c81
...@@ -824,13 +824,13 @@ struct ethtool_rx_flow_spec { ...@@ -824,13 +824,13 @@ struct ethtool_rx_flow_spec {
static inline __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie) static inline __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie)
{ {
return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie; return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie;
}; }
static inline __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie) static inline __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie)
{ {
return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >> return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >>
ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF; ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF;
}; }
/** /**
* struct ethtool_rxnfc - command to get or set RX flow classification rules * struct ethtool_rxnfc - command to get or set RX flow classification rules
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment