lkml.org 
[lkml]   [2018]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 023/126] ethtool: Remove trailing semicolon for static inline
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Florian Fainelli <f.fainelli@gmail.com>

    [ 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: 8cf6f497de40 ("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>
    ---
    include/uapi/linux/ethtool.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/include/uapi/linux/ethtool.h
    +++ b/include/uapi/linux/ethtool.h
    @@ -898,13 +898,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

    \
     
     \ /
      Last update: 2018-09-18 01:31    [W:4.096 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site