]>
Commit | Line | Data |
---|---|---|
13e8e92f GKH |
1 | From foo@baz Mon Sep 17 12:22:41 CEST 2018 |
2 | From: Florian Fainelli <f.fainelli@gmail.com> | |
3 | Date: Sat, 4 Aug 2018 14:20:40 -0700 | |
4 | Subject: ethtool: Remove trailing semicolon for static inline | |
5 | ||
6 | From: Florian Fainelli <f.fainelli@gmail.com> | |
7 | ||
8 | [ Upstream commit d89d41556141a527030a15233135ba622ba3350d ] | |
9 | ||
10 | Android's header sanitization tool chokes on static inline functions having a | |
11 | trailing semicolon, leading to an incorrectly parsed header file. While the | |
12 | tool should obviously be fixed, also fix the header files for the two affected | |
13 | functions: ethtool_get_flow_spec_ring() and ethtool_get_flow_spec_ring_vf(). | |
14 | ||
15 | Fixes: 8cf6f497de40 ("ethtool: Add helper routines to pass vf to rx_flow_spec") | |
16 | Reporetd-by: Blair Prescott <blair.prescott@broadcom.com> | |
17 | Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> | |
18 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
19 | Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> | |
20 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
21 | --- | |
22 | include/uapi/linux/ethtool.h | 4 ++-- | |
23 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
24 | ||
25 | --- a/include/uapi/linux/ethtool.h | |
26 | +++ b/include/uapi/linux/ethtool.h | |
27 | @@ -882,13 +882,13 @@ struct ethtool_rx_flow_spec { | |
28 | static inline __u64 ethtool_get_flow_spec_ring(__u64 ring_cookie) | |
29 | { | |
30 | return ETHTOOL_RX_FLOW_SPEC_RING & ring_cookie; | |
31 | -}; | |
32 | +} | |
33 | ||
34 | static inline __u64 ethtool_get_flow_spec_ring_vf(__u64 ring_cookie) | |
35 | { | |
36 | return (ETHTOOL_RX_FLOW_SPEC_RING_VF & ring_cookie) >> | |
37 | ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF; | |
38 | -}; | |
39 | +} | |
40 | ||
41 | /** | |
42 | * struct ethtool_rxnfc - command to get or set RX flow classification rules |